Fix estimator loop, consider rest plugins as well.