Fix/payment processing

Fix #345