Fixed issue with subscriptions