Squashed a payment bug