Minor robustness improvement