Fixing bug with notificaitons. Sigh.