fixing dataSource params