Fix Notifier Factory