diff --git a/vndk/tools/vtable-dumper/elf_handling.cpp b/vndk/tools/vtable-dumper/elf_handling.cpp
index e0483dbdb..7b115dfbe 100644
--- a/vndk/tools/vtable-dumper/elf_handling.cpp
+++ b/vndk/tools/vtable-dumper/elf_handling.cpp
@@ -329,8 +329,9 @@ SymbolRef ELFSharedObject<ELFT>::matchValueToSymbol(
     const std::string ClassName(Vtablep->getDemangledName().substr(pos));
     for (const SymbolRef &Symbol : SymVec) {
         StringRef SymbolName = UnWrap(Symbol.getName());
-        if (SymbolName.str().find(ClassName) != std::string::npos)
+        if (demangle(SymbolName.str()).find(ClassName) != std::string::npos) {
             return Symbol;
+        }
     }
     // Return the 1st Symbol by default.
     return SymVec[0];