This and other instances of "> -1" should also be changed to ">= 0"