Fixed bug in dataSource