diff --git a/archlabs-installer b/archlabs-installer
index 089af5f..c17cbf4 100755
--- a/archlabs-installer
+++ b/archlabs-installer
@@ -5,7 +5,7 @@
 # Some ideas and code reworked from other resources
 # AIF, Calamares, and the Arch Wiki.. Credit where credit is due
 
-VER=2.1.17
+VER=2.1.18
 
 # default values {
 
@@ -401,7 +401,7 @@ select_keymap()
 		by Belarusian az    Azerbaijani mk Macedonian kh Khmer     epo Esperanto \
 		me Montenegrin || return 1
 
-	if [[ $CMAPS == *"$KEYMAP"* ]]; then
+	if [[ $CMAPS == *"$KEYMAP "* ]]; then
 		CMAP="$KEYMAP"
 	else
 		dlg CMAP menu "Console Keymap" "$_vconsole" $CMAPS || return 1
@@ -2510,7 +2510,11 @@ umount_dir()
 chk_connect()
 {
 	msg "Network Connect" "\nVerifying network connection\n" 0
-	ping -qc1 'archlinux.org' > /dev/null 2>&1
+	if [[ $VM ]] && hash nm-online > /dev/null 2>&1; then
+		nm-online > /dev/null 2>&1
+	else
+		ping -qc1 'archlinux.org' > /dev/null 2>&1
+	fi
 }
 
 net_connect()