bugfix when changing subscriptions