diff --git a/publish-nix.sh b/publish-nix.sh
index 82c1913e..9bd1912e 100644
--- a/publish-nix.sh
+++ b/publish-nix.sh
@@ -98,14 +98,14 @@ then
     # Create Test archives
     for FRAMEWORK in "${FRAMEWORKS[@]}"
     do
-        # If we have an invalid combination of framework and runtime
-        if [ ! $(echo ${VALID_CROSS_PLATFORM_FRAMEWORKS[@]} | fgrep -w $FRAMEWORK) ] && [ $(echo ${VALID_CROSS_PLATFORM_RUNTIMES[@]} | fgrep -w $RUNTIME) ]
-        then
-            continue
-        fi
-
         for RUNTIME in "${RUNTIMES[@]}"
         do
+            # If we have an invalid combination of framework and runtime
+            if [ ! $(echo ${VALID_CROSS_PLATFORM_FRAMEWORKS[@]} | fgrep -w $FRAMEWORK) ] && [ $(echo ${VALID_CROSS_PLATFORM_RUNTIMES[@]} | fgrep -w $RUNTIME) ]
+            then
+                continue
+            fi
+
             cd $BUILD_FOLDER/Test/bin/Debug/${FRAMEWORK}/${RUNTIME}/publish/
             if [ $(echo ${NON_DLL_FRAMEWORKS[@]} | fgrep -w $FRAMEWORK) ] || [ $(echo ${NON_DLL_RUNTIMES[@]} | fgrep -w $RUNTIME) ]
             then
diff --git a/publish-win.ps1 b/publish-win.ps1
index 50952bf6..b8feeb40 100644
--- a/publish-win.ps1
+++ b/publish-win.ps1
@@ -100,7 +100,7 @@ if (!$NO_ARCHIVE.IsPresent)
             Set-Location -Path $BUILD_FOLDER\Test\bin\Debug\${FRAMEWORK}\${RUNTIME}\publish\
             if ($NON_DLL_FRAMEWORKS -contains $FRAMEWORK -or $NON_DLL_RUNTIMES -contains $RUNTIME)
             {
-                7z a -tzip -x!CascLib.dll -x!mspack.dll -x!StormLib.dll $BUILD_FOLDER\BinaryObjectScanner_${FRAMEWORK}_${RUNTIME}_debug.zip *
+                7z a -tzip -x'!CascLib.dll' -x'!mspack.dll' -x'!StormLib.dll' $BUILD_FOLDER\BinaryObjectScanner_${FRAMEWORK}_${RUNTIME}_debug.zip *
             }
             else
             {
@@ -109,7 +109,7 @@ if (!$NO_ARCHIVE.IsPresent)
             Set-Location -Path $BUILD_FOLDER\Test\bin\Release\${FRAMEWORK}\${RUNTIME}\publish\
             if ($NON_DLL_FRAMEWORKS -contains $FRAMEWORK -or $NON_DLL_RUNTIMES -contains $RUNTIME)
             {
-                7z a -tzip -x!CascLib.dll -x!mspack.dll -x!StormLib.dll $BUILD_FOLDER\BinaryObjectScanner_${FRAMEWORK}_${RUNTIME}_release.zip *
+                7z a -tzip -x'!CascLib.dll' -x'!mspack.dll' -x'!StormLib.dll' $BUILD_FOLDER\BinaryObjectScanner_${FRAMEWORK}_${RUNTIME}_release.zip *
             }
             else
             {