--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixReferenceEventsFacet.java	Mon Aug 19 22:04:03 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixReferenceEventsFacet.java	Mon Aug 19 22:19:09 2013 +0200
@@ -76,19 +76,25 @@
         FixResult result = (FixResult) res.getData();
         double currentKm = getCurrentKm(context);
 
-        logger.debug("current km in FRE: " + currentKm);
+        if (logger.isDebugEnabled()) {
+            logger.debug("current km in FRE: " + currentKm);
+        }
 
         KMIndex<QWD []> kmQWs = result.getReferenced();
         KMIndex.Entry<QWD []> kmQWsEntry = kmQWs.binarySearch(currentKm);
-        if (kmQWsEntry != null) {
-            int ndx = index & 255;
-            for (QWD qwd: kmQWsEntry.getValue()) {
-                if (qwd.getIndex() == ndx) {
-                    return qwd;
-                }
-            }
+
+        if (kmQWsEntry == null) {
+            return null;
         }
-        return null;
+
+        // The lower eight bits contain the index of the point.
+        int ndx = index & 255;
+        QWD [] qwds = kmQWsEntry.getValue();
+        if (ndx >= qwds.length) {
+            logger.error("index too large: " + ndx + " " + qwds.length);
+            return null;
+        }
+        return qwds[ndx];
     }