Trying to fix an issue with notifications