Index: trunk/BNC/src/bncrinex.cpp
===================================================================
--- trunk/BNC/src/bncrinex.cpp	(revision 4502)
+++ trunk/BNC/src/bncrinex.cpp	(revision 4503)
@@ -346,4 +346,13 @@
   }
 
+  // A Few Additional Comments
+  // -------------------------
+  QStringList addComments;
+  addComments << format.left(6) + " " + _mountPoint.host() + _mountPoint.path();
+
+  if (_nmea == "yes") {
+    addComments << "NMEA LAT=" + _latitude + " " + "LONG=" + _longitude;
+  }
+
   // Set Marker Name
   // ---------------
@@ -360,6 +369,4 @@
                         << "C2" << "P2" << "L2" << "S2";
   }
-
-  QStringList addComments;
 
   // Set Default RINEX v3 Types
@@ -398,19 +405,14 @@
   }
 
-  // A few additional comments
-  // -------------------------
-  QMap<QString, QString> txtMap;
-
-  addComments << format.left(6) + " " + _mountPoint.host() + _mountPoint.path();
-
-  if (_nmea == "yes") {
-    addComments << "NMEA LAT=" + _latitude + " " + "LONG=" + _longitude;
-  }
-
-  txtMap["COMMENT"] = addComments.join("\\n");
-
+  // Write the Header
+  // ----------------
   QByteArray headerLines;
   QTextStream outHlp(&headerLines);
+
+  QMap<QString, QString> txtMap;
+  txtMap["COMMENT"] = addComments.join("\\n");
+
   _header.write(&outHlp, &txtMap);
+
   outHlp.flush();
   _out << headerLines.data();