diff --git a/geocoder/hierarchy_reader.cpp b/geocoder/hierarchy_reader.cpp
index c59ff8b356..ae734f97ef 100644
--- a/geocoder/hierarchy_reader.cpp
+++ b/geocoder/hierarchy_reader.cpp
@@ -163,7 +163,7 @@ void HierarchyReader::ReadEntryMap(multimap<base::GeoObjectId, Entry> & entries,
     bufferSize = 0;
 
     {
-      auto && lock = lock_guard<mutex>(m_mutex);
+      lock_guard<mutex> lock(m_mutex);
 
       for (; bufferSize < kLineBufferCapacity; ++bufferSize)
       {
diff --git a/geocoder/index.cpp b/geocoder/index.cpp
index 622edf34da..21b30be043 100644
--- a/geocoder/index.cpp
+++ b/geocoder/index.cpp
@@ -98,7 +98,7 @@ void Index::AddStreet(DocId const & docId, Index::Doc const & doc)
 void Index::AddHouses(unsigned int loadThreadsCount)
 {
   atomic<size_t> numIndexed{0};
-  mutex mutex;
+  mutex buildingsMutex;
 
   vector<thread> threads(loadThreadsCount);
   CHECK_GREATER(threads.size(), 0, ());
@@ -134,7 +134,7 @@ void Index::AddHouses(unsigned int loadThreadsCount)
           auto const & candidateDoc = GetDoc(candidate);
           if (candidateDoc.IsParentTo(buildingDoc))
           {
-            auto && lock = lock_guard<std::mutex>(mutex);
+            lock_guard<mutex> lock(buildingsMutex);
             m_relatedBuildings[candidate].emplace_back(docId);
           }
         });