logic AND between constructs fixed