Fix to fetcher