Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs
===================================================================
diff -u -radadc631ccc42cb15f6fb6b81cccf46229e31ed6 -rfd572b1d0d0be95b5218314d9022665514b68caf
--- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision adadc631ccc42cb15f6fb6b81cccf46229e31ed6)
+++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision fd572b1d0d0be95b5218314d9022665514b68caf)
@@ -628,7 +628,8 @@
                           .AddValidateCalculationItem(nodeData,
                                                       Validate,
                                                       EnableValidateAndCalculateMenuItemForCalculation)
-                          .AddPerformCalculationItem(calculation, nodeData, Calculate, EnableValidateAndCalculateMenuItemForCalculation)
+                          .AddPerformCalculationItem<WaveImpactAsphaltCoverWaveConditionsCalculation, WaveImpactAsphaltCoverWaveConditionsCalculationContext>(
+                              nodeData, Calculate, EnableValidateAndCalculateMenuItemForCalculation)
                           .AddSeparator()
                           .AddClearCalculationOutputItem(calculation)
                           .AddDeleteItem()
@@ -657,11 +658,10 @@
                                                           assessmentSection.GetNorm(calculation.InputParameters.CategoryType));
         }
 
-        private void Calculate(WaveImpactAsphaltCoverWaveConditionsCalculation calculation,
-                               WaveImpactAsphaltCoverWaveConditionsCalculationContext context)
+        private void Calculate(WaveImpactAsphaltCoverWaveConditionsCalculationContext context)
         {
             ActivityProgressDialogRunner.Run(Gui.MainWindow,
-                                             WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                             WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(context.WrappedData,
                                                                                                                                       context.FailureMechanism,
                                                                                                                                       context.AssessmentSection));
         }