Fixed bug related to updating subscriptions