Fixing DataSource issue with basic arrays