Fix issue with notifications