Jérome: slightly adjusted manually to just use range where it does not
make a significant difference (for example in test)