Bugfix for subscriptions