Changed if-else statement ranges
Changed if-else statement ranges
Revert "Changed if-else statement ranges"

This reverts commit 4a99a0b75dcef844f088a09fbeb4178016bdcec9.