diff --git a/prepare.sh b/prepare.sh
index 2bfbd02..2e85bac 100755
--- a/prepare.sh
+++ b/prepare.sh
@@ -54,6 +54,9 @@ function arch_executors() {
         ;;
     esac
   done
+  if [[ "${ANSWER}" == *"${ARCH_TARGET}"* ]]; then
+    export "ANSWER=x86_64 ${ANSWER}"
+  fi
   echo "ARCH_EXECUTORS=${ANSWER}" >> "${TMPDIR}/androot.env"
 }
 
@@ -163,9 +166,10 @@ function location() {
     # create directory
     indicate_exec "Creating location directory"
     if ! mkdir -p "${ANSWER}/rootfs"; then
-      indicate_fail;
+      indicate_fail
       exit 1
     fi
+    indicate_ok
   fi
   echo "LOCATION=${ANSWER}" >> "${TMPDIR}/androot.env"
 }