diff --git a/base/etc/one-context.d/04-mount-swap b/base/etc/one-context.d/04-mount-swap
index 06881e0..78967fc 100755
--- a/base/etc/one-context.d/04-mount-swap
+++ b/base/etc/one-context.d/04-mount-swap
@@ -2,9 +2,9 @@
 
 activate_swaps() {
 
-    SWAP_DRIVES=$(blkid | grep 'TYPE=\"swap\"' | cut -d':' -f1)
+    SWAP_DRIVES=$(blkid -t TYPE="swap" -o device)
     for SWAP in $SWAP_DRIVES ; do
-        if [ -z "$(swapon -s | grep $SWAP)"]; then
+        if [ -z "$(swapon -s | grep $SWAP)" ]; then
             swapon $SWAP
         fi
     done