Notifications Fix
Merge pull request #1766 from rog1121/notification-fix

Notifications Fix