fix subscriptions