Subscription fix