diff --git a/Client/syntaxes/upsilon.tmLanguage.json b/Client/syntaxes/upsilon.tmLanguage.json
index 56b3114..72c17dd 100644
--- a/Client/syntaxes/upsilon.tmLanguage.json
+++ b/Client/syntaxes/upsilon.tmLanguage.json
@@ -71,7 +71,7 @@
       ]
     },
     {
-      "match": "\\b[^.]([+-]?([^.][0-9]*[.])?[0-9]+)[^.]\\b",
+      "match": "\\b([0-9]+(.[0-9])?)\\b",
       "name": "constant.numeric"
     },
     {
diff --git a/UpsilonLanguageServer/Lib/Upsilon.dll b/UpsilonLanguageServer/Lib/Upsilon.dll
index 69524f3..c06dec7 100644
Binary files a/UpsilonLanguageServer/Lib/Upsilon.dll and b/UpsilonLanguageServer/Lib/Upsilon.dll differ
diff --git a/UpsilonLanguageServer/Lib/Upsilon.pdb b/UpsilonLanguageServer/Lib/Upsilon.pdb
index 9344757..e3a7729 100644
Binary files a/UpsilonLanguageServer/Lib/Upsilon.pdb and b/UpsilonLanguageServer/Lib/Upsilon.pdb differ
diff --git a/UpsilonLanguageServer/UpsilonLanguageServer/Services/TextDocumentServer.cs b/UpsilonLanguageServer/UpsilonLanguageServer/Services/TextDocumentServer.cs
index ab20f19..aecb546 100644
--- a/UpsilonLanguageServer/UpsilonLanguageServer/Services/TextDocumentServer.cs
+++ b/UpsilonLanguageServer/UpsilonLanguageServer/Services/TextDocumentServer.cs
@@ -123,9 +123,9 @@ namespace UpsilonLanguageServer.Services
                         if (variableSymbol.VariableSymbol is TableVariableSymbol tableSymbol)
                         {
                             return new CompletionList(
-                                tableSymbol.Variables.Select(x => new CompletionItem(x.Name,
-                                    CompletionItemKind.Variable, x.Type.ToString(),
-                                    $"\n\n{string.Join("  \n", x.CommentValue)}")));
+                                tableSymbol.Variables.Select(x => new CompletionItem(x.Key,
+                                    CompletionItemKind.Variable, x.Value.Type.ToString(),
+                                    $"\n\n{string.Join("  \n", x.Value.CommentValue)}")));
                         }
                         return new CompletionList(
                             new[]