Fixed notifications issue