Notification Fix 6