diff --git a/scripts/base.py b/scripts/base.py
index f701348..6f90431 100644
--- a/scripts/base.py
+++ b/scripts/base.py
@@ -881,7 +881,7 @@ def extract_unicode(src, dst):
 
 def archive_folder(src, dst):
   app = "7za" if ("mac" == host_platform()) else "7z"
-  return cmd_exe(app, ["a", "-r", dst, src])
+  return cmd_exe(app, ["a", dst, src])
 
 # windows vcvarsall
 def _call_vcvarsall_and_return_env(arch):
diff --git a/scripts/deploy_core.py b/scripts/deploy_core.py
index 66b3881..20c3889 100644
--- a/scripts/deploy_core.py
+++ b/scripts/deploy_core.py
@@ -59,9 +59,9 @@ def make():
     base.copy_exe(core_build_dir + "/bin/" + platform_postfix, archive_dir, "x2ttester")
 
 
-    if base.is_file(archive_dir + "/core.7z"):
-      base.delete_file(archive_dir + "/core.7z")
-    base.archive_folder(archive_dir, archive_dir + "/core.7z")
+    if base.is_file(archive_dir + ".7z"):
+      base.delete_file(archive_dir + ".7z")
+    base.archive_folder(archive_dir + "/*", archive_dir + ".7z")
 
   return
 
diff --git a/scripts/package_core.py b/scripts/package_core.py
index c0cfc14..4e7db65 100644
--- a/scripts/package_core.py
+++ b/scripts/package_core.py
@@ -24,7 +24,7 @@ def make_core():
   }
   repo = repos[common.platform]
   branch = utils.get_env("BRANCH_NAME")
-  core_7z = utils.get_path("build_tools/out/%s/%s/core/core.7z" % (prefix, company))
+  core_7z = utils.get_path("build_tools/out/%s/%s/core.7z" % (prefix, company))
   dest_version = "%s/core/%s/%s/%s/" % (repo["repo"], branch, repo["version"], repo["arch"])
   dest_latest = "%s/core/%s/%s/%s/" % (repo["repo"], branch, "latest", repo["arch"])