Notifier works properly again with events