diff --git a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClass.java b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClass.java
index 495b630200..80b386f1cd 100644
--- a/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClass.java
+++ b/Ghidra/Features/Decompiler/ghidra_scripts/classrecovery/RecoveredClass.java
@@ -488,7 +488,8 @@ public class RecoveredClass {
 
 			int offset = newComponent.getOffset();
 
-			DataTypeComponent currentComponent = computedClassStructure.getComponentAt(offset);
+			DataTypeComponent currentComponent =
+				computedClassStructure.getComponentContaining(offset);
 			DataType currentComponentDataType = currentComponent.getDataType();
 
 			if (currentComponentDataType.equals(newComponentDataType)) {