Rest Notification service fix