Notifiers Fix