diff --git a/workflow/engine/classes/class.derivation.php b/workflow/engine/classes/class.derivation.php
index 312d1399f..e153f468b 100755
--- a/workflow/engine/classes/class.derivation.php
+++ b/workflow/engine/classes/class.derivation.php
@@ -176,14 +176,14 @@ class Derivation
             }
 
             $rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-
+            $flagDefault = false;
             while ($rsCriteria->next()) {
                 $arrayRouteData = G::array_merges($rsCriteria->getRow(), $arrayData);
 
                 if ((int)($arrayRouteData["ROU_DEFAULT"]) == 1) {
                     $arrayNextTaskDefault = $arrayRouteData;
-                    $arrayNextTask = array();
-                    break;
+                    $flagDefault = true;
+                    continue;
                 }
 
                 $flagContinue = true;
@@ -207,7 +207,6 @@ class Derivation
                         $flagContinue = false;
                     }
                 }
-
                 if ($arrayRouteData["ROU_TYPE"] == "EVALUATE" && count($arrayNextTask) > 0) {
                     $flagContinue = false;
                 }
@@ -216,7 +215,6 @@ class Derivation
                     $arrayNextTask[++$i] = $this->prepareInformationTask($arrayRouteData);
                 }
             }
-
             if (count($arrayNextTask) == 0 && count($arrayNextTaskDefault) > 0) {
                 $arrayNextTask[++$i] = $this->prepareInformationTask($arrayNextTaskDefault);
             }
diff --git a/workflow/engine/methods/appFolder/appFolderAjax.php b/workflow/engine/methods/appFolder/appFolderAjax.php
index 4f6dafa7f..c6aa461ac 100755
--- a/workflow/engine/methods/appFolder/appFolderAjax.php
+++ b/workflow/engine/methods/appFolder/appFolderAjax.php
@@ -1409,6 +1409,10 @@ function copyMoveExecuteTree($uidFolder, $newUidFolder)
             //Copy file
             $arrayPathFromFile = G::getPathFromFileUID($docInfo["APP_UID"], $docUid);
             $newFile = $arrayPathFromFile[0] . PATH_SEP . $arrayPathFromFile[1] . "_" . $docInfo["DOC_VERSION"] . "." . $extension;
+            
+            if(!file_exists($path . $arrayPathFromFile[0])) {
+                mkdir( $path . $arrayPathFromFile[0], 0777, true );
+            }
 
             copy($path . $originFile, $path . $newFile);
         } else {