Subscription lock fix