Bug fix for file data source