Fixed if-clauses