bugfix for subscriptions