Moved the notification generator to the right scope inside SetComplete