Another offset bug fix