diff --git a/README.md b/README.md
index 0722a0d5f86a91535903cda01674465e6d438fbf..e390ddae21377698b865c1b8d1eb7c3be83d7766 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
 ## Tree
 
 The TreeApi handles the retrieving or storing metadata to a certain path.
+
diff --git a/src/Tree/Controllers/TreeController.cs b/src/Tree/Controllers/TreeController.cs
index 4c58bd5e3b67a2aeea1bb6ace8d188163136f102..23dc8470652f880099fda4e1f6edfbb51a2544b3 100644
--- a/src/Tree/Controllers/TreeController.cs
+++ b/src/Tree/Controllers/TreeController.cs
@@ -149,8 +149,8 @@ namespace Coscine.Api.Tree.Controllers
                             {
                                 Name = GetFolderOrFileName(x),
                                 Path = x.Key,
-                                Size = (int)x.BodyBytes,
-                                Kind = x.Key[(x.Key.LastIndexOf(".") + 1)..],
+                                Size = x.BodyBytes,
+                                Kind = x.HasBody ? "file" : "folder",
                                 Provider = resource.Type.DisplayName
                             };
                             var objectMetaInfoReturnObject = new ObjectMetaInfoReturnObject(objectMetaInfo, _blobApiLink, resource.Id.ToString());