1) Fix for subscriptions (extra unuseful subscriptions removed)