Fix for defect #313

Pls. ignore the PaymentCreator change, you have already made it.