Fix more offset bug