Composite array dataSource hotfix