Fixing self-notification