Fixed offset bug for real this time.