Corrected a bug with the notification that caused the delegate to be registered multiple times