diff --git a/repackjre.sh b/repackjre.sh
index 1a240fe..2f771d0 100644
--- a/repackjre.sh
+++ b/repackjre.sh
@@ -16,10 +16,10 @@ mkdir -p "$out"
 
 # here comes a not-so-complicated functions to easily make desired arch
 ## Usage: makearch [jre_libs_dir_name] [name_in_tarball]
-makearch () { echo "Making $2..."; cd "$work"; tar xf $(ls "$in/jre8-$2-*release.tar.xz") > /dev/null 2>&1; mv bin $work1/;  mkdir -p $work1/lib; mv lib/$1 $work1/lib/; mv lib/jexec $work1/lib/; tar cJf bin-$2.tar.xz -C $work1 . > /dev/null 2>&1; mv bin-$2.tar.xz "$out/"; rm -rf "$work/*"; rm -rf "$work1/*"; }
+makearch () { echo "Making $2..."; cd "$work"; tar xf $(find "$in" -name jre8-$2-*release.tar.xz) > /dev/null 2>&1; mv bin $work1/;  mkdir -p $work1/lib; mv lib/$1 $work1/lib/; mv lib/jexec $work1/lib/; tar cJf bin-$2.tar.xz -C $work1 . > /dev/null 2>&1; mv bin-$2.tar.xz "$out/"; rm -rf "$work/*"; rm -rf "$work1/*"; }
 
 # this one's static
-makeuni () { echo "Making universal..."; cd "$work"; tar xf $(ls "$in/jre8-arm64-*release.tar.xz") > /dev/null 2>&1; rm -rf bin; rm -rf lib/aarch64; rm lib/jexec; tar cJf universal.tar.xz * > /dev/null 2>&1; mv universal.tar.xz "$out/"; rm -rf "$work/*"; }
+makeuni () { echo "Making universal..."; cd "$work"; tar xf $(find "$in" -name jre8-arm64-*release.tar.xz) > /dev/null 2>&1; rm -rf bin; rm -rf lib/aarch64; rm lib/jexec; tar cJf universal.tar.xz * > /dev/null 2>&1; mv universal.tar.xz "$out/"; rm -rf "$work/*"; }
 
 # now time to use them!
 makeuni