fix  notifixcation bugs