Improved robustness of final calculation