Notification Bug Fix