fix for batch payment application, #22147