Fixed offset bug