Prevent issue with new Subscriptions