fixing datasource injection