diff --git a/tools/edis/EDOperand.cpp b/tools/edis/EDOperand.cpp
index 495c0574d6c..ca8bac1c5b4 100644
--- a/tools/edis/EDOperand.cpp
+++ b/tools/edis/EDOperand.cpp
@@ -227,7 +227,9 @@ uint64_t EDOperand::immediateVal() {
 }
 
 int EDOperand::isMemory() {
-  switch (Inst.ThisInstInfo->operandFlags[OpIndex]) {
+  uint8_t operandType = Inst.ThisInstInfo->operandTypes[OpIndex];
+    
+  switch (operandType) {
   default:
     return 0;
   case kOperandTypeX86Memory: