Fix for existing subscriptions