Fix notificationService