Improve robustness