diff --git a/editor_queries/neovim/highlights.scm b/editor_queries/neovim/highlights.scm
index fcfd993..879b52c 100644
--- a/editor_queries/neovim/highlights.scm
+++ b/editor_queries/neovim/highlights.scm
@@ -97,8 +97,10 @@
 (tlb_serialization
   "as" @keyword
   type: (identifier) @type.builtin
-  (#match? @type.builtin
-    "^(coins|remaining|bytes32|bytes64|int257|u?int(?:2[0-5][0-6]|1[0-9][0-9]|[1-9][0-9]?))$"))
+  (#any-of? @type.builtin "int257" "coins" "remaining" "bytes32" "bytes64")
+  (#lua-match? @type.builtin "^u?int2[0-5][0-6]$")
+  (#lua-match? @type.builtin "^u?int1[0-9][0-9]$")
+  (#lua-match? @type.builtin "^u?int[1-9][0-9]?$"))
 
 ; string
 ; ------
diff --git a/test/sample/example.tact b/test/sample/example.tact
index e1f0d75..2a05efb 100644
--- a/test/sample/example.tact
+++ b/test/sample/example.tact
@@ -25,7 +25,7 @@ trait MyTrait {
     }
 }
 
-contract MyContract with MyTrait, Ownable? {
+contract MyContract with MyTrait, Ownable {
     owner: Address; // comment
     value: Int as uint32 = 1230;
     counters: map<Int, Address> /* Address, "Address" */ ;