Fixing fake estimator (WIP)