Minor fix.
Fix related to the short-circuit evaluation of boolean operators.