Fix remaining bug of the off-by-one error ;)