Fixed Notification bug