Fixed short-circuit evaluation.