Robustness fix