Fixed Notification Bug