diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index 1f7ca0984..beb40f137 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -9168,13 +9168,9 @@ void Tokenizer::createSymbolDatabase()
         }
 
         // Set function pointers
-        const std::size_t functions = _symbolDatabase->functionScopes.size();
-        for (std::size_t i = 0; i < functions; ++i) {
-            const Scope * scope = _symbolDatabase->functionScopes[i];
-            for (Token* tok = scope->classStart->next(); tok != scope->classEnd; tok = tok->next()) {
-                if (Token::Match(tok, "%var% (")) {
-                    tok->function(_symbolDatabase->findFunction(tok));
-                }
+        for (Token* tok = list.front(); tok != list.back(); tok = tok->next()) {
+            if (Token::Match(tok, "%var% (")) {
+                tok->function(_symbolDatabase->findFunction(tok));
             }
         }