Increase error robustness (hopefully)