Fix defect - Finalize after rate value in 2-value path