Notification fix done