Fix: dataSource controller bug