diff --git a/routing/cross_mwm_road_graph.cpp b/routing/cross_mwm_road_graph.cpp
index 00aaebee0e..27313cf966 100644
--- a/routing/cross_mwm_road_graph.cpp
+++ b/routing/cross_mwm_road_graph.cpp
@@ -178,7 +178,7 @@ void CrossMwmGraph::GetOutgoingEdgesList(BorderCross const & v,
   CHECK(found, ());
   if (ingoingNode.m_nodeId != v.toNode.node)
   {
-    LOG(LDEBUG, ("Several nodes stores in one border point.", v.toNode.point));
+    LOG(LDEBUG, ("Several nodes stores in a one border point.", v.toNode.point));
     vector<IngoingCrossNode> ingoingNodes;
     currentContext.GetAllIngoingNodes(ingoingNodes);
     for(auto const & node : ingoingNodes)
diff --git a/routing/routing_tests/cross_routing_tests.cpp b/routing/routing_tests/cross_routing_tests.cpp
index 52d692ea1a..58e3108081 100644
--- a/routing/routing_tests/cross_routing_tests.cpp
+++ b/routing/routing_tests/cross_routing_tests.cpp
@@ -104,4 +104,31 @@ UNIT_TEST(TestAdjacencyMatrix)
              routing::kInvalidContextEdgeWeight, ("Default cost"));
 }
 
+UNIT_TEST(TestFindingByPoint)
+{
+  routing::CrossRoutingContextWriter context;
+  routing::CrossRoutingContextReader newContext;
+
+  ms::LatLon p1(1., 1.), p2(5., 5.), p3(10.,1.);
+
+  context.AddIngoingNode(1, ms::LatLon::Zero());
+  context.AddIngoingNode(2, p1);
+  context.AddIngoingNode(3, p2);
+  context.AddOutgoingNode(4, "foo", ms::LatLon::Zero());
+  context.ReserveAdjacencyMatrix();
+
+  vector<char> buffer;
+  MemWriter<vector<char> > writer(buffer);
+  context.Save(writer);
+  TEST_GREATER(buffer.size(), 5, ("Context serializer make some data"));
+
+  MemReader reader(buffer.data(), buffer.size());
+  newContext.Load(reader);
+  IngoingCrossNode node;
+  TEST(newContext.FindIngoingNodeByPoint(p1, node), ());
+  TEST_EQUAL(node.m_nodeId, 2, ());
+  TEST(newContext.FindIngoingNodeByPoint(p2, node), ());
+  TEST_EQUAL(node.m_nodeId, 3, ());
+  TEST(!newContext.FindIngoingNodeByPoint(p3, node), ());
 }
+}  // namespace