Added robustness.