Fix normal repayment logic