Small robustness fix