Preemptive fix for off by 1