diff --git a/src/ZoneCode/Game/T6/T6_Commands.txt b/src/ZoneCode/Game/T6/T6_Commands.txt
index dd6b95c1..e19258fc 100644
--- a/src/ZoneCode/Game/T6/T6_Commands.txt
+++ b/src/ZoneCode/Game/T6/T6_Commands.txt
@@ -330,7 +330,7 @@ set count GfxPixelShaderLoadDef::program programSize;
 // MaterialShaderArgument
 use MaterialShaderArgument;
 //set condition u::literalConst type == MTL_ARG_LITERAL_VERTEX_CONST || type == MTL_ARG_LITERAL_PIXEL_CONST;
-//set condition u::literalConst type == 1 || type == 7;
+set condition u::literalConst type == 1 || type == 7;
 set reusable u::literalConst;
 set count u::literalConst 1;
 
diff --git a/src/ZoneCodeGenerator/Parsing/CommandFile/Tests/TestWithEvaluation.cs b/src/ZoneCodeGenerator/Parsing/CommandFile/Tests/TestWithEvaluation.cs
index 3a9c6994..89f14b27 100644
--- a/src/ZoneCodeGenerator/Parsing/CommandFile/Tests/TestWithEvaluation.cs
+++ b/src/ZoneCodeGenerator/Parsing/CommandFile/Tests/TestWithEvaluation.cs
@@ -44,6 +44,7 @@ namespace ZoneCodeGenerator.Parsing.CommandFile.Tests
         // operationType ::= + | - | * | / | << | >> | ...
         private static readonly TokenMatcher operationType = new MatcherGroupOr(
             OperationType.Types
+                .OrderByDescending(type => type.Syntax.Length)
                 .Select(type => new MatcherLiteral(type.Syntax.ToCharArray().Select(c => c.ToString()).ToArray()).WithName(TokenOperationType))
                 .Cast<TokenMatcher>().ToArray()
         ).WithTag(TagOperationType);