* Fix decimal calculation * Recalc when shorcutting estimate Former-commit-id: e7f457cf1b0fa66964320b259a70ae196fff50a7