--- a/artifacts/src/main/java/org/dive4elements/river/exports/FixWaterlevelExporter.java	Mon Sep 17 10:20:08 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/FixWaterlevelExporter.java	Mon Sep 17 16:00:00 2018 +0200
@@ -51,9 +51,9 @@
     private final Map<String, Double> gaugeQ_W_Map = new HashMap<>();
 
     @Override
-    protected void writeRow4(final CSVWriter writer, final double wqkm[], final D4EArtifact flys, final Gauge gauge) {
-        if (!isQ()) {
-            super.writeRow4(writer, wqkm, flys, gauge);
+    protected void writeRow4(final CSVWriter writer, final double wqkm[], final D4EArtifact flys, final Gauge gauge, final boolean isQ) {
+        if (!isQ) {
+            super.writeRow4(writer, wqkm, flys, gauge, isQ);
         } else {
             final NumberFormat kmf = getKmFormatter();
             final NumberFormat wf = getWFormatter();
@@ -68,9 +68,10 @@
 
     /** Write an csv-row at gauge location. */
     @Override
-    protected void writeRow6(final CSVWriter writer, final double wqkm[], final String wOrQDesc, final D4EArtifact flys, final Gauge gauge) {
-        if (!isQ()) {
-            super.writeRow6(writer, wqkm, wOrQDesc, flys, gauge);
+    protected void writeRow6(final CSVWriter writer, final double wqkm[], final String wOrQDesc, final D4EArtifact flys, final String gaugeName,
+            final Gauge gauge, final boolean isQ) {
+        if (!isQ) {
+            super.writeRow6(writer, wqkm, wOrQDesc, flys, gaugeName, gauge, isQ);
         } else {
             final NumberFormat kmf = getKmFormatter();
             final NumberFormat wf = getWFormatter();
@@ -79,7 +80,7 @@
             final String waterlevel = getWaterlevel(wqkm[1], gauge);
 
             writer.writeNext(new String[] { kmf.format(wqkm[2]), wf.format(wqkm[0]), waterlevel, qf.format(RiverUtils.roundQ(wqkm[1])), wOrQDesc,
-                    RiverUtils.getLocationDescription(flys, wqkm[2]), gauge.getName() });
+                    RiverUtils.getLocationDescription(flys, wqkm[2]), gaugeName });
         }
     }
 
@@ -118,7 +119,7 @@
 
     @Override
     protected void writeCSVHeader(final CSVWriter writer, final boolean atGauge, final boolean isQ) {
-        if (!isQ()) {
+        if (!isQ) {
             super.writeCSVHeader(writer, atGauge, isQ);
         } else {
             log.info("WaterlevelExporter.writeCSVHeader");