Fix datafetcher