Fix self-notify bug