Actually fixing issue with ExtraRange correctly, rounding error was not the problem. In fact reverting rounding to floor as before