Fix 52843321: Refactored condition to use existing defs removing the method added before