fixing subscriptions