diff --git a/src/main/java/org/caosdb/server/resource/FileSystemResource.java b/src/main/java/org/caosdb/server/resource/FileSystemResource.java
index acb0f6b0706273557731ff68dddf345b99cf5169..e6859caac82ee685e2938d7c9dc2a121ceeb6e26 100644
--- a/src/main/java/org/caosdb/server/resource/FileSystemResource.java
+++ b/src/main/java/org/caosdb/server/resource/FileSystemResource.java
@@ -92,13 +92,13 @@ public class FileSystemResource extends AbstractCaosDBServerResource {
       file = entity.getFSODescriptor();
 
       if (file.getObjectType() == ObjectType.DIRECTORY) {
-        String url = getUtils().getServerRootURI() + "/FileSystem/" + path.toString();
+        String url = getUtils().getServerRootURI() + "/FileSystem/" + file.getPath().toString();
         if (!url.endsWith(Path.DEFAULT_PATH_SEPARATOR)) {
           url = url + Path.DEFAULT_PATH_SEPARATOR;
         }
         final Element folder = new Element("dir");
         folder.setAttribute("path", Path.DEFAULT_PATH_SEPARATOR + file.getPath().toString());
-        folder.setAttribute("name", path.isEmpty() ? "/" : file.getName());
+        folder.setAttribute("name", file.getPath().isEmpty() ? "/" : file.getName());
         folder.setAttribute("url", url);
 
         for (final VirtualFSODescriptorInterface child : file.listChildren()) {