Fixed off-by-1 errors