diff --git a/renderdoc/driver/d3d12/d3d12_common.cpp b/renderdoc/driver/d3d12/d3d12_common.cpp
index f670f5abc..c027be267 100644
--- a/renderdoc/driver/d3d12/d3d12_common.cpp
+++ b/renderdoc/driver/d3d12/d3d12_common.cpp
@@ -312,13 +312,13 @@ void MakeShaderReflection(DXBC::DXBCFile *dxbc, ShaderReflection *refl,
 
     if(IsReadWrite)
     {
+      mapping->ReadWriteResources[rwidx] = map;
       refl->ReadWriteResources[rwidx++] = res;
-      mapping->ReadWriteResources[i] = map;
     }
     else
     {
+      mapping->ReadOnlyResources[roidx] = map;
       refl->ReadOnlyResources[roidx++] = res;
-      mapping->ReadOnlyResources[i] = map;
     }
   }