diff --git a/Candran.sublime-syntax b/Candran.sublime-syntax
index 175fa55..923eeb4 100644
--- a/Candran.sublime-syntax
+++ b/Candran.sublime-syntax
@@ -371,6 +371,8 @@ contexts:
       scope: keyword.operator.arithmetic.candran
     - match: \~
       scope: keyword.operator.bitwise.candran
+    - match: '@'
+      scope: variable.language.this.candran
     - match: not{{identifier_break}}
       scope: keyword.operator.logical.candran
 
@@ -400,9 +402,6 @@ contexts:
     - match: self|@{{identifier_break}}
       scope: variable.language.this.candran
       pop: true
-    - match: '@{{identifier_start}}'
-      scope: variable.language.this.candran
-      pop: true
 
   support:
     - match: |-