Fixed prepayment issue