Fixing payment_plan