BUG Fix off-by-one error