Fixed issue with Notification