Added comparisons to -1 back.