Subscription payment refactoring fix;