Working on bug with notifications