Tweak the fetch script