Bug/issue when estimate value is saved