Fix bug in DataSourceBuilder