Fixes subscriptions