Notification fix 7