Possibly fix namefetcher