diff --git a/all.sas b/all.sas
index 5361f00..09a0b79 100644
--- a/all.sas
+++ b/all.sas
@@ -2779,7 +2779,8 @@ run;
   /* create folders and copy content */
   data _null_;
     set work.&tempds;
-    filepath2="&target/"!!substr(filepath,%length(&source)+2);
+    if _n_ = 1 then dpos+sum(length(directory),2);
+    filepath2="&target/"!!substr(filepath,dpos);
     if file_or_folder='folder' then call execute('%mf_mkdir('!!filepath2!!')');
     else do;
       length fref1 fref2 $8;
diff --git a/base/mp_copyfolder.sas b/base/mp_copyfolder.sas
index dfbed16..0800857 100644
--- a/base/mp_copyfolder.sas
+++ b/base/mp_copyfolder.sas
@@ -55,7 +55,8 @@
   /* create folders and copy content */
   data _null_;
     set work.&tempds;
-    filepath2="&target/"!!substr(filepath,%length(&source)+2);
+    if _n_ = 1 then dpos+sum(length(directory),2);
+    filepath2="&target/"!!substr(filepath,dpos);
     if file_or_folder='folder' then call execute('%mf_mkdir('!!filepath2!!')');
     else do;
       length fref1 fref2 $8;