fix multiple clauses issue