diff --git a/misc/sampleconfigs/autohotspot.sh.stretch-default2-Hotspot.sample b/misc/sampleconfigs/autohotspot.sh.stretch-default2-Hotspot.sample
index e4d7d62d4..a4850dc47 100644
--- a/misc/sampleconfigs/autohotspot.sh.stretch-default2-Hotspot.sample
+++ b/misc/sampleconfigs/autohotspot.sh.stretch-default2-Hotspot.sample
@@ -165,7 +165,7 @@ CheckSSID()
             ip addr flush "$wifidev"
             ip link set dev "$wifidev" down
             rm -r /var/run/wpa_supplicant >/dev/null 2>&1
-            createAdHocNetwork
+    createAdHocNetwork
         else #"No SSID, activating Hotspot"
             createAdHocNetwork
         fi
@@ -173,7 +173,7 @@ CheckSSID()
 }
 
 CheckDevice
-if rfkill list wifi | grep -i "Soft blocked: no" > /dev/null 2>&1 ; then
+if (rfkill list wifi -rno HARD,SOFT | grep -i "unblocked.*unblocked") >/dev/null 2>&1 ; then
     FindSSID
     CheckSSID
 else