Fixed off by 1 bug