diff --git a/build.sh b/build.sh
index a74080f..36a05c3 100755
--- a/build.sh
+++ b/build.sh
@@ -111,7 +111,7 @@ EOF
 				log "Begin ${SUB_STAGE_DIR}/${RUN_SCRIPT}"
 				"./${RUN_SCRIPT}"
 				log "End ${SUB_STAGE_DIR}/${RUN_SCRIPT}"
-			elif [ -f ${i}-run.sh ]; then
+			elif [ "${RUN_SCRIPT}" = "${i}-run.sh" ] && [ -f "${SUB_STAGE_DIR}/${i}-run.sh" ]; then
 				log "Skip ${SUB_STAGE_DIR}/${i}-run.sh (not executable)"
 			fi
 		done
diff --git a/depends b/depends
index 16f8b22..fd5f4d1 100644
--- a/depends
+++ b/depends
@@ -21,6 +21,6 @@ bc
 gpg
 pigz
 arch-test
-squashfs-tools
+mksquashfs:squashfs-tools
 xorriso
-mtools
\ No newline at end of file
+mformat:mtools
\ No newline at end of file