ZEN-12689: small changes in condition

as suggested, updating fix per ZEN-13198