fixed the subscriptions