diff --git a/patchimage.sh b/patchimage.sh
index 58e28a9..2d5bb46 100755
--- a/patchimage.sh
+++ b/patchimage.sh
@@ -91,7 +91,7 @@ case ${GAME_TYPE} in
 		check_input_image_special
 		check_riivolution_patch
 
-		${WIT} extract "${IMAGE}" ${WORKDIR} --psel=DATA -vv || exit 1
+		${WIT} extract ${IMAGE} ${WORKDIR} --psel=DATA -vv || exit 1
 
 		detect_game_version
 		rm -f ${GAMEID}.wbfs ${CUSTOMID}.wbfs
diff --git a/script.d/common.sh b/script.d/common.sh
index 4acbd65..6176a23 100644
--- a/script.d/common.sh
+++ b/script.d/common.sh
@@ -161,13 +161,13 @@ check_input_image_nsmb () {
 
 	if [[ ! ${IMAGE} ]]; then
 		if test -f SMN?01.wbfs; then
-			IMAGE=$(eval echo SMN?01.wbfs)
+			IMAGE=SMN?01.wbfs
 		elif test -f SMN?01.iso; then
-			IMAGE=$(eval echo SMN?01.iso)
+			IMAGE=SMN?01.iso
 		elif test -f ${PATCHIMAGE_WBFS_DIR}/SMN?01.iso; then
-			IMAGE=$(eval echo ${PATCHIMAGE_WBFS_DIR}/SMN?01.iso)
+			IMAGE=${PATCHIMAGE_WBFS_DIR}/SMN?01.iso
 		elif test -f ${PATCHIMAGE_WBFS_DIR}/SMN?01.wbfs; then
-			IMAGE=$(eval echo ${PATCHIMAGE_WBFS_DIR}/SMN?01.wbfs)
+			IMAGE=${PATCHIMAGE_WBFS_DIR}/SMN?01.wbfs
 		else
 			echo -e "please specify image to use with --iso=<path>"
 			exit 1