diff --git a/generator/routing_index_generator.cpp b/generator/routing_index_generator.cpp
index 5a8c64c6b0..cce62d8954 100644
--- a/generator/routing_index_generator.cpp
+++ b/generator/routing_index_generator.cpp
@@ -390,7 +390,7 @@ void FillWeights(string const & path, string const & mwmFile, string const & cou
   shared_ptr<VehicleModelInterface> vehicleModel =
       CarModelFactory(countryParentNameGetterFn).GetVehicleModelForCountry(country);
   IndexGraph graph(
-      GeometryLoader::CreateFromFile(mwmFile, vehicleModel),
+      make_shared<Geometry>(GeometryLoader::CreateFromFile(mwmFile, vehicleModel)),
       EdgeEstimator::Create(VehicleType::Car, *vehicleModel, nullptr /* trafficStash */));
 
   MwmValue mwmValue(LocalCountryFile(path, platform::CountryFile(country), 0 /* version */));
diff --git a/track_analyzing/track_matcher.cpp b/track_analyzing/track_matcher.cpp
index 78ed6f5a93..cc9069bb05 100644
--- a/track_analyzing/track_matcher.cpp
+++ b/track_analyzing/track_matcher.cpp
@@ -63,7 +63,8 @@ TrackMatcher::TrackMatcher(storage::Storage const & storage, NumMwmId mwmId,
 
   MwmSet::MwmHandle const handle = m_index.GetMwmHandleByCountryFile(countryFile);
   m_graph = make_unique<IndexGraph>(
-      GeometryLoader::Create(m_index, handle, m_vehicleModel, false /* loadAltitudes */),
+      make_shared<Geometry>(
+          GeometryLoader::Create(m_index, handle, m_vehicleModel, false /* loadAltitudes */)),
       EdgeEstimator::Create(VehicleType::Car, *m_vehicleModel, nullptr /* trafficStash */));
 
   DeserializeIndexGraph(*handle.GetValue<MwmValue>(), VehicleType::Car, *m_graph);