diff --git a/lw.comm-server.service b/lw.comm-server.service
index d9f18a2..fc512bd 100644
--- a/lw.comm-server.service
+++ b/lw.comm-server.service
@@ -11,7 +11,7 @@ SyslogIdentifier=lw.comm-server
 WorkingDirectory=/home/pi/lw.comm-server
 User=pi
 #Group=<alternate group>
-Environment=NODE_ENV=production PORT=8000
+Environment=NODE_ENV=production WEB_PORT=8000
 
 [Install]
 WantedBy=multi-user.target
diff --git a/server.js b/server.js
index 4e9cfc4..50d8901 100644
--- a/server.js
+++ b/server.js
@@ -692,7 +692,8 @@ io.sockets.on('connection', function (appSocket) {
 
                     } else if (data.indexOf('Grbl') === 0) { // Check if it's Grbl
                         firmware = 'grbl';
-                        fVersion = data.substr(5, 4); // get version
+                        var versionStart = data.indexOf(' ');
+                        fVersion = data.substr(versionStart, 4); // get version
                         fDate = '';
                         writeLog('GRBL detected (' + fVersion + ')', 1);
                         io.sockets.emit('firmware', {firmware: firmware, version: fVersion, date: fDate});