diff --git a/hopsworks-common/src/main/java/io/hops/hopsworks/common/upload/UploadController.java b/hopsworks-common/src/main/java/io/hops/hopsworks/common/upload/UploadController.java
index d8a2b36613..9d8d8cb7e9 100644
--- a/hopsworks-common/src/main/java/io/hops/hopsworks/common/upload/UploadController.java
+++ b/hopsworks-common/src/main/java/io/hops/hopsworks/common/upload/UploadController.java
@@ -99,7 +99,7 @@ public boolean upload(InputStream uploadedInputStream, FlowInfo flowInfo, String
    * @return
    */
   public boolean isUploaded(FlowInfo flowInfo, String hdfsPath) {
-    flowInfo.setFilePath(getTmpStagingDir(flowInfo.getFilename(), hdfsPath).toString());
+    flowInfo.setFilePath(getTmpStagingDir(hdfsPath, flowInfo.getFilename()).toString());
     return storage.isUploaded(flowInfo.hashCode(), flowInfo.getChunkNumber());
   }
 
@@ -217,7 +217,7 @@ private boolean hdfsStagingUpload(InputStream uploadedInputStream, FlowInfo flow
 
   private String getTmpStagingDir(DistributedFileSystemOps dfsOps, String filename, String hdfsPath)
     throws DatasetException {
-    Path userTmpDir = getTmpStagingDir(filename, hdfsPath);
+    Path userTmpDir = getTmpStagingDir(hdfsPath, filename);
     try {
       if (!dfsOps.exists(userTmpDir)) {
         boolean created = dfsOps.mkdirs(userTmpDir, dfsOps.getParentPermission(userTmpDir));