diff --git a/Contractor/Contractor.h b/Contractor/Contractor.h
index 27ac6b107..0dbbc844c 100644
--- a/Contractor/Contractor.h
+++ b/Contractor/Contractor.h
@@ -444,7 +444,7 @@ public:
                 else
                     newEdge.data.id = data.id;
 
-                assert(newEdge.data.via != UINT_MAX);
+                assert(newEdge.data.id != UINT_MAX);
 //                newEdge.data.nameID = data.nameID;
 //                newEdge.data.turnInstruction = data.turnInstruction;
                 newEdge.data.forward = data.forward;
diff --git a/DataStructures/StaticGraph.h b/DataStructures/StaticGraph.h
index c817495a2..f6cd61c89 100644
--- a/DataStructures/StaticGraph.h
+++ b/DataStructures/StaticGraph.h
@@ -95,14 +95,14 @@ public:
                 unsigned v = GetTarget(eid);
                 EdgeData & data = GetEdgeData(eid);
                 if(data.shortcut) {
-                    unsigned eid2 = FindEdgeInEitherDirection(u, data.via);
+                    unsigned eid2 = FindEdgeInEitherDirection(u, data.id);
                     if(eid2 == UINT_MAX) {
-                        DEBUG("cannot find first segment of edge (" << u << "," << data.via << "," << v << ")");
+                        DEBUG("cannot find first segment of edge (" << u << "," << data.id << "," << v << ")");
                         data.shortcut = false;
                     }
-                    eid2 = FindEdgeInEitherDirection(data.via, v);
+                    eid2 = FindEdgeInEitherDirection(data.id, v);
                     if(eid2 == UINT_MAX) {
-                        DEBUG("cannot find second segment of edge (" << u << "," << data.via << "," << v << ")");
+                        DEBUG("cannot find second segment of edge (" << u << "," << data.id << "," << v << ")");
                         data.shortcut = false;
                     }
                 }