Ecommerce: Charge attempts continue after auto-charge set to "no"?

Is there a way to get the system to stop attempting to charge a credit card for a subscription?

For example, the first charge attempt fails, and then the customer cancels their subscription causing it to be set Status=Inactive and Autocharge=No. But the reattempts continue for the number of attempts set in the payment plan.

Need to be able to stop the charge attempts once the subscription is cancelled.