Fixing Installement/Prepayment bug