KRACOEUS-8324: restoring rule logic that was broken from KRACOEUS-7937
Merge pull request #1280 from leoherbie/KRACOEUS-8324

KRACOEUS-8324: restoring rule logic that was broken from KRACOEUS-7937