diff --git a/routing/routing_integration_tests/route_test.cpp b/routing/routing_integration_tests/route_test.cpp
index d3b99fdd84..42a732aeb8 100644
--- a/routing/routing_integration_tests/route_test.cpp
+++ b/routing/routing_integration_tests/route_test.cpp
@@ -788,4 +788,13 @@ UNIT_TEST(Slovenia_Croatia_CrossBorderPenalty)
       FromLatLon(45.22718, 13.596334), 156285);
 }
 
+UNIT_TEST(USA_Birmingham_AL_KeyWest_FL_NoMotorway)
+{
+  RoutingOptionSetter optionsGuard(RoutingOptions::Road::Motorway);
+
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
+      FromLatLon(33.5209837, -86.807945), {0., 0.},
+      FromLatLon(24.5534713, -81.7932587), 1562980);
+}
+
 } // namespace route_test
diff --git a/routing/routing_options.cpp b/routing/routing_options.cpp
index 3868981d62..fe0adee309 100644
--- a/routing/routing_options.cpp
+++ b/routing/routing_options.cpp
@@ -77,6 +77,8 @@ RoutingOptionsClassifier::RoutingOptionsClassifier()
 
 optional<RoutingOptions::Road> RoutingOptionsClassifier::Get(uint32_t type) const
 {
+  ftype::TruncValue(type, 2); // in case of highway-motorway-bridge
+
   auto const * res = m_data.Find(type);
   if (res)
     return *res;