diff --git a/fw_updater_packer_unpacker/unofficial_pkg_repacker.sh b/fw_updater_packer_unpacker/unofficial_pkg_repacker.sh
index 73086d3..4c16cfd 100755
--- a/fw_updater_packer_unpacker/unofficial_pkg_repacker.sh
+++ b/fw_updater_packer_unpacker/unofficial_pkg_repacker.sh
@@ -55,7 +55,8 @@ if [[ ! -d $INDIR ]]; then
 fi
 
 echo "* zip data.."
-cd $INDIR && tar -czf repacked_pkg.tar.gz FwUpdater/ && cd ..
+CUR_DIR=$(pwd)
+cd $INDIR && tar -czf repacked_pkg.tar.gz FwUpdater/ && cd $CUR_DIR
 
 echo "* encrypt zipped tar"
 openssl enc -e -aes-256-cbc -K `cat $AESFILE` -iv `cat $IVFILE` -in $INDIR/repacked_pkg.tar.gz -out $TMPDIR/tmp.step1
diff --git a/python_api/assets/start_eufwupdater.sh b/python_api/assets/start_eufwupdater.sh
index d848c0f..0440f0b 100644
--- a/python_api/assets/start_eufwupdater.sh
+++ b/python_api/assets/start_eufwupdater.sh
@@ -101,7 +101,7 @@ dd if=$1 of=$IV bs=1 skip=${IV_OFFSET} count=32 2>/dev/null
 ########################################
 # decrypt data and extract directory tree
 ########################################
-dd if=$1 bs=$(($DATA_OFFSET)) skip=1 2>/dev/null | head -c $(($BODY_SIZE)) | openssl enc -d -aes-256-cbc -K `cat ${AES256_KEY}` -iv `cat ${IV}` | tar -xz -C $2
+dd if=$1 bs=$(($DATA_OFFSET)) skip=1 2>/dev/null | head -c $(($BODY_SIZE)) | openssl enc -d -aes-256-cbc -K "cat ${AES256_KEY}" -iv "cat ${IV}" | tar -xz -C $2
 
 
 ########################################