fixed up BaseDataFetcher