fixed notification service stuff