Datasource return bug fix