diff --git a/examples/swap.yml b/examples/swap.yml
index 0dae1b677..0511c5862 100644
--- a/examples/swap.yml
+++ b/examples/swap.yml
@@ -48,7 +48,7 @@ onboot:
     rootfsPropagation: shared
     command: ["/mount.sh", "/var/external"]
   - name: swap
-    image: "linuxkit/swap:edd74ce7ced2b97dba5075012f497570c5490299"
+    image: "linuxkit/swap:d089b31acad8a5f6a5f1c368ddd1dfe1d049b100"
     net: host
     pid: host
     capabilities:
@@ -57,7 +57,7 @@ onboot:
     binds:
      - /var:/var
      - /dev:/dev
-    command: ["swap.sh", "--path", "/var/external/swap", "--size","1G"]
+    command: ["/swap.sh", "--path", "/var/external/swap", "--size", "1G"]
 services:
   - name: rngd
     image: "linuxkit/rngd:3dad6dd43270fa632ac031e99d1947f20b22eec9"
diff --git a/pkg/swap/swap.sh b/pkg/swap/swap.sh
index 77eff3358..18d9081a1 100755
--- a/pkg/swap/swap.sh
+++ b/pkg/swap/swap.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-while [ $# -gt 1 ]; do
+while [ $# -ge 1 ]; do
 	key="$1"
 
 	case $key in
@@ -74,7 +74,9 @@ fi
 ## check each of our conditions
 for cond in $CONDITIONS; do
 	# split the condition parts
-	IFS=: read condtype arg1 arg2 arg3 arg4 <<< "$cond"
+	IFS=: read condtype arg1 arg2 arg3 arg4 <<EOF
+$cond
+EOF
 	case $condtype in
 		part)
 			partition=$arg1