Changed if-clause