Fix issue with data source.