diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/OperandReferenceAnalyzer.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/OperandReferenceAnalyzer.java
index ccf67b1cd7..3b9bad7646 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/OperandReferenceAnalyzer.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/OperandReferenceAnalyzer.java
@@ -348,7 +348,7 @@ public class OperandReferenceAnalyzer extends AbstractAnalyzer {
 					DataType dt = data.getDataType();
 					stuffDefined = true;
 					if (!(dt instanceof StringDataType || data.isPointer())) {
-						if (dt instanceof Undefined) {
+						if (Undefined.isUndefined(dt)) {
 							isUndefinedStuff = true;
 						}
 						else {