Fixed notifications problem