Issue #114: swap if-then-else