fix notifications issue