fixed up subscription cancelling