Payment Collection Bug fix