bugfix: merge 2 when: clauses