Fixed offset timeout bug