fixed subscriptions issue