diff --git a/Parsing/Expression.grammar b/Parsing/Expression.grammar
index e25b009..22aaa67 100644
--- a/Parsing/Expression.grammar
+++ b/Parsing/Expression.grammar
@@ -37,7 +37,7 @@ LEFT_PAREN                   = "("
 RIGHT_PAREN                  = ")"
 LEFT_BRACE                   = "["
 RIGHT_BRACE                  = "]"
-EQ			     = "="
+EQ			     = "=="
 LT			     = "<"
 GT			     = ">"
 LTE                          = "<="
@@ -90,7 +90,7 @@ InTargetExpression = FieldPropertyExpression | InListTargetExpression;
 
 InListTargetExpression = "(" ArgumentList ")";
 
-CompareExpression = ShiftExpression {("=" | ">" | "<" | ">=" | "<=" | "<>") ShiftExpression};
+CompareExpression = ShiftExpression {("==" | ">" | "<" | ">=" | "<=" | "<>") ShiftExpression};
 
 ShiftExpression = AdditiveExpression {("<<" | ">>") AdditiveExpression};
 
diff --git a/Parsing/ExpressionTokenizer.cs b/Parsing/ExpressionTokenizer.cs
index 6d0ea32..4f6a47d 100644
--- a/Parsing/ExpressionTokenizer.cs
+++ b/Parsing/ExpressionTokenizer.cs
@@ -58,7 +58,7 @@ namespace Flee.Parsing
             pattern = new TokenPattern(Convert.ToInt32(ExpressionConstants.RIGHT_BRACE), "RIGHT_BRACE", TokenPattern.PatternType.STRING, "]");
             AddPattern(pattern);
 
-            pattern = new TokenPattern(Convert.ToInt32(ExpressionConstants.EQ), "EQ", TokenPattern.PatternType.STRING, "=");
+            pattern = new TokenPattern(Convert.ToInt32(ExpressionConstants.EQ), "EQ", TokenPattern.PatternType.STRING, "==");
             AddPattern(pattern);
 
             pattern = new TokenPattern(Convert.ToInt32(ExpressionConstants.LT), "LT", TokenPattern.PatternType.STRING, "<");