fix fallout with CHEK payments, RT#39861, RT#39863