Fix FileFetcher