--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/services/MeasurementStationInfoService.java	Thu Oct 16 11:15:09 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/services/MeasurementStationInfoService.java	Thu Oct 16 13:39:22 2014 +0200
@@ -114,6 +114,11 @@
                 }
             }
 
+            String comment = mstation.getComment();
+            if (comment != null) {
+                ec.addAttr(eg, "comment", comment, true);
+            }
+
             String gaugename = mstation.getGaugeName();
             if (gaugename != null) {
                 Element egauge = ec.create("gauge");
@@ -121,13 +126,6 @@
                 eg.appendChild(egauge);
             }
 
-            String comment = mstation.getComment();
-            if (comment != null) {
-                Element ecomment = ec.create("comment");
-                ec.addAttr(ecomment, "comment", comment, true);
-                eg.appendChild(ecomment);
-            }
-
             egs.appendChild(eg);
         }