diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/manager/cmd/DbgReadRegistersCommand.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/manager/cmd/DbgReadRegistersCommand.java
index 24d8dd96b2..59b0646041 100644
--- a/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/manager/cmd/DbgReadRegistersCommand.java
+++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/manager/cmd/DbgReadRegistersCommand.java
@@ -46,12 +46,14 @@ public class DbgReadRegistersCommand extends AbstractDbgCommand<Map<DbgRegister,
 			return Collections.emptyMap();
 		}
 		Map<DbgRegister, BigInteger> result = new LinkedHashMap<>();
-		for (DbgRegister r : regs) {
-			if (registers != null) {
-				DebugValue value = registers.getValueByName(r.getName());
-				if (value != null) {
-					BigInteger bval = new BigInteger(value.encodeAsBytes());
-					result.put(r, bval);
+		if (registers != null) {
+			for (DbgRegister r : regs) {
+				if (r.isBaseRegister()) {
+					DebugValue value = registers.getValueByName(r.getName());
+					if (value != null) {
+						BigInteger bval = new BigInteger(value.encodeAsBytes());
+						result.put(r, bval);
+					}
 				}
 			}
 		}
diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/manager/impl/DbgRegister.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/manager/impl/DbgRegister.java
index 775e5873ec..dbb58764c7 100644
--- a/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/manager/impl/DbgRegister.java
+++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/manager/impl/DbgRegister.java
@@ -84,6 +84,6 @@ public class DbgRegister implements Comparable<DbgRegister> {
 		if (desc == null) {
 			return true;
 		}
-		return desc.subregMaster == 0;
+		return desc.subregMask == 0;
 	}
 }