removed unneeded offset recalculation, thanks Jukka, let's see if this breaks some...