Fetcher fix