fix for subscriptions