fixed problems handling subscriptions