Increase stats robustness