Bugfix inside notification_worker