Temporary fix for data set SQL error