Fix notifications problem