Really really fixed duplicate notifications