Fix to use notification