notification problem fixes