OC-6110
fix for if Expression Evaluates to False