NotificationRules Fix