Repayment fix reloaded