Fixed off by 1 issue