More understandable if clause
Merge pull request #404 from ozbek/master

More understandable if clause