diff --git a/routing/osrm2feature_map.hpp b/routing/osrm2feature_map.hpp
index ce29a0f643..12661dab26 100644
--- a/routing/osrm2feature_map.hpp
+++ b/routing/osrm2feature_map.hpp
@@ -101,7 +101,7 @@ public:
     while (r.first != r.second)
     {
       FtSeg s(m_segments[r.first]);
-      if (s.m_fid != FtSeg::INVALID_FID)
+      if (s.IsValid())
         toDo(s);
       ++r.first;
     }
diff --git a/routing/osrm_router.cpp b/routing/osrm_router.cpp
index b5c33a22a2..c4542b9fd2 100644
--- a/routing/osrm_router.cpp
+++ b/routing/osrm_router.cpp
@@ -700,7 +700,7 @@ OsrmRouter::ResultCode OsrmRouter::MakeRouteFromCrossesPath(CheckedPathT const &
     RawRoutingResultT routingResult;
     FeatureGraphNodeVecT startTask(1), targetTask(1);
     startTask[0] = cross.startNode;
-    if (cross.startNode.m_seg.m_fid == OsrmFtSegMapping::FtSeg::INVALID_FID)
+    if (!cross.startNode.m_seg.IsValid())
     {
       startTask.push_back(cross.startNode);
       startTask[0].m_node.reverse_node_id = INVALID_NODE_ID;
@@ -708,7 +708,7 @@ OsrmRouter::ResultCode OsrmRouter::MakeRouteFromCrossesPath(CheckedPathT const &
     }
 
     targetTask[0] = cross.targetNode;
-    if (cross.targetNode.m_seg.m_fid == OsrmFtSegMapping::FtSeg::INVALID_FID)
+    if (!cross.targetNode.m_seg.IsValid())
     {
       targetTask.push_back(cross.targetNode);
       targetTask[0].m_node.reverse_node_id = INVALID_NODE_ID;