fix certain problems with third-party payment, #23579