*8825* Fixed off-by-one