Minor robustness change.