Fixed estimation bug