Fixed bugs in payment task