diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/impl/FeatureVectorContainerDataSet.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/impl/FeatureVectorContainerDataSet.java
index 6b8a87eb973240730278afbb79264ad0b90e2064..e17820b192d1ac4f7a4b85fcc9cb5a8e2c2ac50e 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/impl/FeatureVectorContainerDataSet.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/impl/FeatureVectorContainerDataSet.java
@@ -103,4 +103,9 @@ public class FeatureVectorContainerDataSet extends DataSet<DataSetInformation> i
         getRegistrationDetails().setPropertyValue(propertyCode, propertyValue);
     }
 
+    @Override
+    public File getDataSetStagingFolder()
+    {
+        return originalDataset.getDataSetStagingFolder();
+    }
 }
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/ImagingDataSetRegistrationTransaction.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/ImagingDataSetRegistrationTransaction.java
index e259d1395e68f07a8e6a2ad62086e219b8999cba..237bf728294420ae2c31a9cb7a7d920a88285edd 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/ImagingDataSetRegistrationTransaction.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/ImagingDataSetRegistrationTransaction.java
@@ -517,7 +517,7 @@ public class ImagingDataSetRegistrationTransaction extends DataSetRegistrationTr
                         "Cannot move the files because the original dataset is missing: " + src);
             }
 
-            return super.moveFile(src, originalDataSet, getDestinationInOriginal(dstInDataset));
+            return super.moveFile(src, originalDataSet, dstInDataset);
         }
 
         return super.moveFile(src, dst, dstInDataset);