Fix issue with generating subscriptions