fixed if clauses