slightly improved robustness