Really fix the previous off-by-one error