Model fetcher fix