Fixing problem with multiple datasets.