--- a/artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixATExport.java	Thu Jun 13 10:01:01 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixATExport.java	Thu Jun 13 11:43:02 2013 +0200
@@ -16,6 +16,8 @@
 
 import org.dive4elements.river.artifacts.access.FixAccess;
 
+import org.dive4elements.river.utils.RiverUtils;
+
 import org.dive4elements.river.artifacts.math.fitting.Function;
 import org.dive4elements.river.artifacts.math.fitting.FunctionFactory;
 
@@ -26,6 +28,8 @@
 
 import org.dive4elements.river.exports.AbstractExporter;
 
+import org.dive4elements.river.model.River;
+
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
@@ -80,12 +84,11 @@
 
         Writer writer = new OutputStreamWriter(out, DEFAULT_CSV_CHARSET);
 
-        FixAccess access = new FixAccess((D4EArtifact)this.master);
         FixATWriter atWriter = new FixATWriter(this.function, this.parameters);
         NodeList nodes = request.getElementsByTagName("km");
         String km = nodes.item(0).getTextContent();
         double dkm = Double.parseDouble(km);
-        String river = access.getRiver();
+        River river = RiverUtils.getRiver((D4EArtifact)master);
         atWriter.write(writer, context.getMeta(), river, dkm);
         writer.close();
     }