Also changed other occurences of the same situation to use the same checking method (>= rather than a +1) for consistency. Fixes bug #2981704.
