Fixed notification problem