diff --git a/scripts/appveyor/coapp_make.ps1 b/scripts/appveyor/coapp_make.ps1
index ad95ad37..c557453a 100644
--- a/scripts/appveyor/coapp_make.ps1
+++ b/scripts/appveyor/coapp_make.ps1
@@ -1,3 +1,25 @@
+. .\scripts\appveyor\appveyor_get_build.ps1
+. .\scripts\appveyor\appveyor_get_artifacts.ps1
+
+# get job artifacts
+Write-Host "Start to download artifacts from other jobs"
+
+(Get-AppVeyorBuild).build.jobs | foreach-object {
+    $jobId = $_.jobId
+    if ($jobId -ne $env:APPVEYOR_JOB_ID) {
+        # Get job artifacts information
+        (Get-AppVeyorArtifacts -Job $jobId) | foreach-object {
+            # Create directory if not exists
+            $filePath = $_.fileName.Substring(0, $_.fileName.LastIndexOf('/'))
+            if (!(Test-Path -Path $filePath)) {
+                New-Item -ItemType "directory" -Path $filePath
+            }
+            # Download artifact from other job
+            Start-FileDownload "https://ci.appveyor.com/api/buildjobs/$jobId/artifacts/$($_.fileName)" -FileName $_.fileName
+        }
+    };
+}
+
 Write-Host "Start to build nupkg files"
 
 # This is the CoApp .autopkg file to create.
diff --git a/scripts/appveyor/wait_for_other_jobs.ps1 b/scripts/appveyor/wait_for_other_jobs.ps1
index e9e7e486..4a2aa2df 100644
--- a/scripts/appveyor/wait_for_other_jobs.ps1
+++ b/scripts/appveyor/wait_for_other_jobs.ps1
@@ -1,5 +1,4 @@
 . .\scripts\appveyor\appveyor_get_build.ps1
-. .\scripts\appveyor\appveyor_get_artifacts.ps1
 
 # Only deploy when commit message contains "[deploy]"
 if (!(Get-AppVeyorBuild).build.message.Contains('[deploy]')) { return }
@@ -28,22 +27,5 @@ if (!$success) {
     throw "Test jobs were not finished in $env:time_out_mins minutes"
 }
 
-# get job artifacts
-(Get-AppVeyorBuild).build.jobs | foreach-object {
-    $jobId = $_.jobId
-    if ($jobId -ne $env:APPVEYOR_JOB_ID) {
-        # Get job artifacts information
-        (Get-AppVeyorArtifacts -Job $jobId) | foreach-object {
-            # Create directory if not exists
-            $filePath = $_.fileName.Substring(0, $_.fileName.LastIndexOf('/'))
-            if (!(Test-Path -Path $filePath)) {
-                New-Item -ItemType "directory" -Path $filePath
-            }
-            # Download artifact from other job
-            Start-FileDownload "https://ci.appveyor.com/api/buildjobs/$jobId/artifacts/$($_.fileName)" -FileName $_.fileName
-        }
-    };
-}
-
 # Set flag to deploy
 $env:flag_to_deploy = $success
\ No newline at end of file
diff --git a/scripts/coapp/kiwano.autopkg.template b/scripts/coapp/kiwano.autopkg.template
index 1268ad59..bf625a43 100644
--- a/scripts/coapp/kiwano.autopkg.template
+++ b/scripts/coapp/kiwano.autopkg.template
@@ -124,7 +124,7 @@ nuget {
             lib += ${OUTPUT_DIR}v142\Win32\Release\*.lib;
         }
 
-        # kiwano-network 3-rd patry
+        // kiwano-network 3-rd patry
         bin += ${KIWANO_NETWORK_ROOT}dlls\*.dll;
 
     };