fix to make cancelling subscriptions work