Estimates recalculation, fix #1