--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixAnalysisCalculation.java	Fri Jul 27 14:32:14 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixAnalysisCalculation.java	Fri Jul 27 14:33:41 2018 +0200
@@ -130,7 +130,8 @@
         int kmIndex   = parameters.columnIndex("km");
         int maxQIndex = parameters.columnIndex("max_q");
 
-        double [] wq = new double[2];
+        final double [] ws = new double[1];
+        final double [] qs = new double[1];
 
         int [] parameterIndices =
             parameters.columnIndices(function.getParameterNames());
@@ -221,33 +222,43 @@
                             continue;
                         }
 
-                        Column column = cc.getColumn(meta);
-                        if (column == null || !column.getQW(km, wq)) {
+                        final Column column = cc.getColumn(meta);
+                        if (column == null )
                             continue;
-                        }
 
-                        double fw = instance.value(wq[1]);
+                        boolean interpolated = !column.getQW(km, qs, ws, 0);
+                        // FIXME: it was like this before... check if this has an effekt on the calculation
+                        interpolated = true;
+
+                        final double w = ws[0];
+                        final double q = qs[0];
+                        if( Double.isNaN(w) || Double.isNaN(q))
+                            continue;
+
+                        double fw = instance.value(q);
                         if (Double.isNaN(fw)) {
                             continue;
                         }
 
-                        double dw = (wq[0] - fw)*100.0;
+                        double dw = (w - fw)*100.0;
 
+                        
                         stdDev.increment(dw);
 
                         Date date = column.getDate();
                         String description = column.getDescription();
-
+                        
+                        
                         QWD qwd = new QWD(
-                            wq[1], wq[0],
+                            q, w,
                             description,
-                            date, true,
+                            date, interpolated,
                             dw, getIndex(col2index, column.getIndex()));
 
                         qwds.add(qwd);
 
-                        sumW += wq[0];
-                        sumQ += wq[1];
+                        sumW += w;
+                        sumQ += q;
 
                         dateAverager.add(date);
                     }