Added extra robustness