diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/GenericAddress.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/GenericAddress.java
index f2de13f3cd..983d5a5d83 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/GenericAddress.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/GenericAddress.java
@@ -281,7 +281,7 @@ public class GenericAddress implements Address {
 		}
 		long mod = 0;
 		if (unitSize > 1) {
-			mod = displayOffset % unitSize;
+			mod = Long.remainderUnsigned(displayOffset, unitSize);
 			displayOffset = addrSpace.getAddressableWordOffset(displayOffset);
 		}
 
@@ -294,7 +294,7 @@ public class GenericAddress implements Address {
 		buf.append(addressString);
 		if (mod != 0) {
 			buf.append('.');
-			buf.append(mod);
+			buf.append(Long.toHexString(mod));
 		}
 		if (stackFormat) {
 			buf.append(STACK_ADDRESS_SUFFIX);