diff --git a/warp4j b/warp4j
index f67d4a7..1ab20f9 100755
--- a/warp4j
+++ b/warp4j
@@ -519,8 +519,9 @@ for target in ${TARGETS[@]}; do
     ensure_distro_unpacked $target $CONCRETE_JAVA_VERSION
 done
 
-JLINK=$JAVA_DOWNLOAD_PATH/$THIS_PLATFORM/$CONCRETE_JAVA_VERSION/$UNPACKED_SUBDIR/bin/jlink
-JDEPS=$JAVA_DOWNLOAD_PATH/$THIS_PLATFORM/$CONCRETE_JAVA_VERSION/$UNPACKED_SUBDIR/bin/jdeps
+JDK_PATH=$JAVA_DOWNLOAD_PATH/$THIS_PLATFORM/$CONCRETE_JAVA_VERSION/$UNPACKED_SUBDIR
+JLINK=$JDK_PATH/bin/jlink
+JDEPS=$JDK_PATH/bin/jdeps
 
 # modules are only needed if JDK optimisation is performed
 if [[ $JAVA_DISTRO_TYPE == $DISTRO_TYPE_JDK ]]; then