diff --git a/build-docker.sh b/build-docker.sh
index b6a9ea3..82fa7e1 100755
--- a/build-docker.sh
+++ b/build-docker.sh
@@ -41,7 +41,7 @@ if test -z "${CONFIG_FILE}"; then
 	exit 1
 else
 	# shellcheck disable=SC1090
-	source ${CONFIG_FILE}
+	source "${CONFIG_FILE}"
 fi
 
 CONTAINER_NAME=${CONTAINER_NAME:-pigen_work}
diff --git a/build.sh b/build.sh
index a8247ab..f640fa8 100755
--- a/build.sh
+++ b/build.sh
@@ -229,7 +229,10 @@ fi
 mkdir -p "${WORK_DIR}"
 log "Begin ${BASE_DIR}"
 
-STAGE_LIST=${STAGE_LIST:-${BASE_DIR}/stage*}
+SAVEIFS=$IFS
+IFS=$(echo -en "\n\b")
+
+STAGE_LIST=${STAGE_LIST:-"${BASE_DIR}"/stage*}
 
 for STAGE_DIR in $STAGE_LIST; do
 	STAGE_DIR=$(realpath "${STAGE_DIR}")
@@ -261,3 +264,5 @@ if [ -x ${BASE_DIR}/postrun.sh ]; then
 fi
 
 log "End ${BASE_DIR}"
+
+IFS=$SAVEIFS