Fixing issue with DataSource