diff --git a/usr/bin/archboot-setup.sh b/usr/bin/archboot-setup.sh
index f5888bdf1..03a754603 100755
--- a/usr/bin/archboot-setup.sh
+++ b/usr/bin/archboot-setup.sh
@@ -833,7 +833,7 @@ _createraid()
     DIALOG --infobox "Creating ${RAIDDEVICE}..." 0 0
     mdadm --create ${RAIDDEVICE} ${RAIDOPTIONS} ${DEVICES} >${LOG} 2>&1 || \
     (DIALOG --msgbox "Error creating ${RAIDDEVICE} (see ${LOG} for details)." 0 0; return 1)
-    if echo "${RAIDDEVICE}" | grep -q "/md_d[0-9"]; then
+    if [[ ${RAID_PARTITION} == "1" ]]; then
         # switch for mbr usage
         set_guid
         if [[ "${GUIDPARAMETER}" = "" ]]; then