notifier related bug fix