Fixed bug with notifier