YH-597: fix those conditionals