diff --git a/src/renderer_d3d12.cpp b/src/renderer_d3d12.cpp
index 84fc445c7..563530022 100644
--- a/src/renderer_d3d12.cpp
+++ b/src/renderer_d3d12.cpp
@@ -2536,6 +2536,10 @@ data.NumQualityLevels = 0;
 					{
 						operand.regIndex[1] += cast.offset;
 					}
+					else if (DxbcOperandAddrMode::RegImm32 == operand.addrMode[1])
+					{
+						operand.regIndex[1] += cast.offset;
+					}
 				}
 			}
 		}
diff --git a/src/shader_dxbc.cpp b/src/shader_dxbc.cpp
index 812f4ce57..1575d4cf3 100644
--- a/src/shader_dxbc.cpp
+++ b/src/shader_dxbc.cpp
@@ -1550,7 +1550,7 @@ namespace bgfx
 										, "%d + %s%d"
 										, operand.regIndex[jj]
 										, s_dxbcOperandType[operand.subOperand[jj].type]
-										, operand.regIndex[jj]
+										, operand.subOperand[jj].regIndex
 										);
 					break;