Fix order clauses