Notification/unsubscribe does not work as expected fixed