Fix for payment creation