Fix datasource issue