diff --git a/src/lib_cxx/data/indexer/CxxIndexerCommandProvider.cpp b/src/lib_cxx/data/indexer/CxxIndexerCommandProvider.cpp
index e117a141..c85f57f8 100644
--- a/src/lib_cxx/data/indexer/CxxIndexerCommandProvider.cpp
+++ b/src/lib_cxx/data/indexer/CxxIndexerCommandProvider.cpp
@@ -102,7 +102,7 @@ void CxxIndexerCommandProvider::addCommand(const std::shared_ptr<IndexerCommandC
 		}
 	}
 
-	m_commands[command->getSourceFilePath()] = representation;
+	m_commands.emplace(command->getSourceFilePath(), representation);
 }
 
 std::vector<FilePath> CxxIndexerCommandProvider::getAllSourceFilePaths() const
diff --git a/src/lib_cxx/data/indexer/CxxIndexerCommandProvider.h b/src/lib_cxx/data/indexer/CxxIndexerCommandProvider.h
index 28b10bf3..d67283e2 100644
--- a/src/lib_cxx/data/indexer/CxxIndexerCommandProvider.h
+++ b/src/lib_cxx/data/indexer/CxxIndexerCommandProvider.h
@@ -39,7 +39,7 @@ private:
 
 	Id m_nextId;
 
-	std::map<FilePath, std::shared_ptr<CommandRepresentation>> m_commands;
+	std::multimap<FilePath, std::shared_ptr<CommandRepresentation>> m_commands;
 
 	std::map<Id, FilePath> m_idsToIndexedPaths;
 	std::map<FilePath, Id> m_indexedPathsToIds;