Fixing lack of robustness.