diff --git a/handlers/sys.in b/handlers/sys.in
index ffdb0e2..52c9392 100644
--- a/handlers/sys.in
+++ b/handlers/sys.in
@@ -633,7 +633,7 @@ if [ "$partitions" == "yes" ]; then
 fi
 
 if [ "$luksheaders" == "yes" ]; then
-   devices=`LC_ALL=C $SFDISK -l 2>/dev/null | grep "^Disk /dev" | @AWK@ '{print $2}' | cut -d: -f1`
+   devices=`LC_ALL=C $SFDISK -l 2>/dev/null | grep '/dev/' | @SED@ -e 's/Disk //' -re 's/:? +.*//g'`
    [ -n "$devices" ] || warning "No block device found"
    partitions=`LC_ALL=C $SFDISK -l 2>/dev/null |grep "^/dev" | @AWK@ '{print $1}'`
    [ -n "$partitions" ] || warning "No partitions found"