Extra robustness