Fixed subscriptions.add and polling