fix clauses with body issue