diff --git a/vdmj/src/main/java/com/fujitsu/vdmj/po/expressions/visitors/POExpressionStateFinder.java b/vdmj/src/main/java/com/fujitsu/vdmj/po/expressions/visitors/POExpressionStateFinder.java
index 985c422b5..6e1badaca 100644
--- a/vdmj/src/main/java/com/fujitsu/vdmj/po/expressions/visitors/POExpressionStateFinder.java
+++ b/vdmj/src/main/java/com/fujitsu/vdmj/po/expressions/visitors/POExpressionStateFinder.java
@@ -48,7 +48,7 @@ public TCNameSet caseVariableExpression(POVariableExpression node, Boolean updat
 	{
 		TCNameSet all = newCollection();
 		
-		if (!updates && node.vardef.nameScope == NameScope.STATE)
+		if (!updates && node.vardef.nameScope.matches(NameScope.STATE))
 		{
 			all.add(node.name);
 		}