Merge pull request #1320 from AnomalRoil/master

Removing always true if condition