fix up datasource mode