Fix dataset selection bug