Improve fetch robustness