diff --git a/warp4j b/warp4j
index dbe4559..b9bd5a0 100755
--- a/warp4j
+++ b/warp4j
@@ -707,7 +707,7 @@ function create_bundle() {
 
     case $JAVA_DISTRO_TYPE in
         $DISTRO_TYPE_JDK)
-            create_optimized_runtime $platform
+            create_optimized_runtime $platform $machine
         ;;
         $DISTRO_TYPE_JRE)
             mkdir -p "$BUNDLES_PATH/$platform/$machine/$BUNDLED_DISTRO_SUBDIR"
@@ -728,7 +728,7 @@ function create_bundle() {
 rm -rf "$BUNDLES_PATH"
 # actually create bundles for all targets
 for target in ${TARGETS[@]}; do
-    create_bundle $target
+    create_bundle $target $X64
 done
 
 # creates binaries and archives for all targets