--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WQ.java	Sat Oct 05 12:49:53 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WQ.java	Sat Oct 05 17:52:16 2013 +0200
@@ -126,8 +126,10 @@
         // When we convert and have a datum we have a calculated
         // result at a gauge so we must subtract the datum.
         double subtractDatum = datum == null ? 0 : datum.doubleValue();
-        for (int i=0; i < wq.size(); i++) {
-            ret.add((wq.get(i)[0] - subtractDatum)* 100, wq.get(i)[1]);
+        double [] data = new double[8];
+        for (int i = 0, WQ = wq.size(); i < WQ; i++) {
+            wq.get(i, data);
+            ret.add((data[0] - subtractDatum)*100d, data[1]);
         }
         log.debug("Converted W values to centimeter and substracted: " + subtractDatum);
         return ret;