DE10772: Better fix for conditions problem.