diff --git a/brouter-core/src/main/java/btools/router/OsmTrack.java b/brouter-core/src/main/java/btools/router/OsmTrack.java
index 98d5e93..1c95880 100644
--- a/brouter-core/src/main/java/btools/router/OsmTrack.java
+++ b/brouter-core/src/main/java/btools/router/OsmTrack.java
@@ -345,6 +345,12 @@ public final class OsmTrack {
       if (i > 0 || ourSize == 0) {
         e.setTime(e.getTime() + t0);
         e.setEnergy(e.getEnergy() + e0);
+        if (e.message != null){
+          if (!(e.message.lon == e.getILon() && e.message.lat == e.getILat())) {
+            e.message.lon = e.getILon();
+            e.message.lat = e.getILat();
+          }
+        }
         nodes.add(e);
       }
     }