Fix for breaking subscriptions