Datasources: Array fix