diff --git a/app/api/Datasets.scala b/app/api/Datasets.scala
index b59e67e8a..dd3a02526 100644
--- a/app/api/Datasets.scala
+++ b/app/api/Datasets.scala
@@ -716,7 +716,15 @@ class  Datasets @Inject()(
       }
       Logger.debug("----- Adding file to dataset completed")
     } else {
+        val foldersContainingFile = folders.findByFileId(file.id).sortBy(_.name)
         Logger.debug("File was already in dataset.")
+        Logger.debug("Remove file from folders in dataset")
+        foldersContainingFile.foreach(folder => {
+          if (folder.parentDatasetId == dsId){
+            folders.removeFile(folder.id, fileId)
+
+          }
+        })
     }
   }
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 1e9f05fcb..30f9f98e3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -51,7 +51,7 @@ services:
 
   # main clowder application
   clowder:
-    image: clowder/clowder:${CLOWDER_VERSION:-latest}
+    image: clowder:bugfix
     restart: unless-stopped
     networks:
       - clowder