Sorry, probably too stupid to put this new rule in a more DRY fashion, but I fiddled enough to get to this working version :)