Extra minor robustness check