diff --git a/printrun/gcoder.py b/printrun/gcoder.py
index 7062467..9c9a7ba 100755
--- a/printrun/gcoder.py
+++ b/printrun/gcoder.py
@@ -47,7 +47,7 @@ class Line(object):
         if ";" in self.raw:
             self.raw = self.raw.split(";")[0].rstrip()
         self.split_raw = self.raw.split(" ")
-        self.command = self.split_raw[0].upper()
+        self.command = self.split_raw[0].upper() if not self.split_raw[0].startswith("n") else self.split_raw[1]
         self.is_move = self.command in ["G0", "G1"]
 
     def parse_coordinates(self, imperial):
diff --git a/printrun/gviz.py b/printrun/gviz.py
index 1dd22d3..0cfdcda 100755
--- a/printrun/gviz.py
+++ b/printrun/gviz.py
@@ -371,10 +371,6 @@ class gviz(wx.Panel):
             return
         gline = gcoder.Line(gcode)
         gline.parse_coordinates(False)
-        # FIXME by iXce : I commented this code out as I have no clue what it does,
-        # but it should be looked at
-        #if gcode[0][0] == 'n': # not sure what this check is for ?
-        #    gcode.pop(0)
 
         def _y(y):
             return self.build_dimensions[1] - (y - self.build_dimensions[4])