Robustness improvement