Fix too_many_clauses error

Changes: