Patched fetching files a bit