Wrong offset bug fix