Improved robustness