Fix field payment method
Merge Fix