notification/subscribe fix