Fixed off-by-one error when user returns