Minor update for robustness