Fixes problem with many datasets with STORAGE_GROUP