Another fix for disable "conditional expression is constant"