Bug fix for Notification