diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDatasetDownloadServlet.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDatasetDownloadServlet.java
index cde1ec1e40504448cf204ded3cfbdc8927f10d08..2479af4058377e08584fce054850a1b7dc5d02d9 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDatasetDownloadServlet.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDatasetDownloadServlet.java
@@ -316,7 +316,7 @@ abstract public class AbstractDatasetDownloadServlet extends HttpServlet
         }
     }
 
-    protected static final class Size
+    public static final class Size
     {
         private final int width;
 
@@ -343,9 +343,10 @@ abstract public class AbstractDatasetDownloadServlet extends HttpServlet
     {
         DatabaseInstance databaseInstance = getDatabaseInstance(session);
         File storeDir = applicationContext.getConfigParameters().getStorePath();
+        String databaseUuid = databaseInstance.getUuid();
+
         File dataSetRootDirectory =
-                DatasetLocationUtil.getDatasetLocationPath(storeDir, dataSetCode, databaseInstance
-                        .getUuid());
+                DatasetLocationUtil.getDatasetLocationPath(storeDir, dataSetCode, databaseUuid);
         if (dataSetRootDirectory.exists() == false)
         {
             throw new UserFailureException("Data set '" + dataSetCode + "' not found in the store.");