diff --git a/common/source/java/ch/systemsx/cisd/common/io/DefaultFileBasedHierarchicalContentNode.java b/common/source/java/ch/systemsx/cisd/common/io/DefaultFileBasedHierarchicalContentNode.java
index a2ef4a23af4b41667de909b4bc83b4db3975be6f..1a9cecaa17b8a4dd02f40eac37a16c18033994cc 100644
--- a/common/source/java/ch/systemsx/cisd/common/io/DefaultFileBasedHierarchicalContentNode.java
+++ b/common/source/java/ch/systemsx/cisd/common/io/DefaultFileBasedHierarchicalContentNode.java
@@ -21,7 +21,6 @@ import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
@@ -83,7 +82,6 @@ class DefaultFileBasedHierarchicalContentNode extends AbstractHierarchicalConten
     public List<IHierarchicalContentNode> doGetChildNodes()
     {
         File[] files = file.listFiles();
-        Arrays.sort(files);
         List<IHierarchicalContentNode> result = new ArrayList<IHierarchicalContentNode>();
         if (files != null)
         {
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServlet.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServlet.java
index 27f04f5660341e9142cce6a2ef2da38af76f15d3..f19a3b1800580a0c8ec6e681b965f98c8e7cc350 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServlet.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServlet.java
@@ -86,7 +86,7 @@ public class DatasetDownloadServlet extends AbstractDatasetDownloadServlet
                     public int compare(IHierarchicalContentNode node1,
                             IHierarchicalContentNode node2)
                     {
-                        return createSortableName(node1).compareTo(createSortableName(node1));
+                        return createSortableName(node1).compareTo(createSortableName(node2));
                     }
 
                     private String createSortableName(IHierarchicalContentNode node)