Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs
===================================================================
diff -u -r48605dff2e892ad7fe634924e8ca8cd8674f0d9a -r70aec506a3315dddf252c1c617ec3bac6b995d79
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision 48605dff2e892ad7fe634924e8ca8cd8674f0d9a)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision 70aec506a3315dddf252c1c617ec3bac6b995d79)
@@ -710,14 +710,16 @@
 
         private static object[] CalculationContextChildNodeObjects(HeightStructuresCalculationContext context)
         {
+            StructuresCalculation<HeightStructuresInput> calculation = context.WrappedData;
+
             return new object[]
             {
-                context.WrappedData.Comments,
-                new HeightStructuresInputContext(context.WrappedData.InputParameters,
-                                                 context.WrappedData,
+                calculation.Comments,
+                new HeightStructuresInputContext(calculation.InputParameters,
+                                                 calculation,
                                                  context.FailureMechanism,
                                                  context.AssessmentSection),
-                new StructuresOutputContext(context.WrappedData)
+                new StructuresOutputContext(calculation)
             };
         }