fix for premature shortcut with multiple rules, and testing