Fix offsets to be consistent with previous code
(#340)