ZEN-12689: small changes in condition