Fix multiple data set issue