Fixed Notification issue