Correct offset handling