General robustness patch from James Harvey: