diff --git a/routing/astar_router.cpp b/routing/astar_router.cpp
index c61ba067bd..2c5c6cca98 100644
--- a/routing/astar_router.cpp
+++ b/routing/astar_router.cpp
@@ -13,6 +13,8 @@ static double const MAX_SPEED = 36.11111111111; // m/s
 void AStarRouter::SetFinalRoadPos(vector<RoadPos> const & finalPos)
 {
   ASSERT_GREATER(finalPos.size(), 0, ());
+  m_entries.clear();
+  PossiblePathQueueT().swap(m_queue);
   for (size_t i = 0; i < finalPos.size(); ++i)
   {
     pair<ShortPathSetT::iterator, bool> t = m_entries.insert(ShortestPath(finalPos[i]));