Fixing issue with multiple data sets