diff --git a/token.cpp b/token.cpp
index 916b2f15f..1192a4329 100644
--- a/token.cpp
+++ b/token.cpp
@@ -135,8 +135,9 @@ bool TOKEN::Match(const TOKEN *tok, const char pattern[], const char *varname1[]
         while ( *p == ' ' )
             p++;
 
-        // Extract token from pattern..
-        char str[50];
+        // Extract token from pattern..
+        // TODO: Refactor this so there can't be buffer overflows
+        char str[500];
         char *s = str;
         while (*p && *p!=' ')
         {