Fix new RateEstimator