BUG 9933 Step conditions evaluating too early IMPROVEMENT