Index: Riskeer/Common/src/Riskeer.Common.Forms/Factories/AggregatedHydraulicBoundaryLocationFactory.cs
===================================================================
diff -u -rba0d13fc7255254a41bcfde2354ed2181a513940 -rbf930d525aab06cc3f2602a58f1049279cbfc08a
--- Riskeer/Common/src/Riskeer.Common.Forms/Factories/AggregatedHydraulicBoundaryLocationFactory.cs	(.../AggregatedHydraulicBoundaryLocationFactory.cs)	(revision ba0d13fc7255254a41bcfde2354ed2181a513940)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Factories/AggregatedHydraulicBoundaryLocationFactory.cs	(.../AggregatedHydraulicBoundaryLocationFactory.cs)	(revision bf930d525aab06cc3f2602a58f1049279cbfc08a)
@@ -66,13 +66,15 @@
                                         location.Id, location.Name, location.Location,
                                         waterLevelCalculations.Select(c => new Tuple<double, RoundedDouble>(
                                                                           c.Value, GetCalculationResult(
-                                                                              c.Key.ToDictionary(x => x.HydraulicBoundaryLocation,
-                                                                                                 x => x)[location].Output)))
+                                                                              c.Key.Single(x => x.HydraulicBoundaryLocation
+                                                                                                 .Equals(location))
+                                                                               .Output)))
                                                               .ToArray(),
                                         waveHeightCalculations.Select(c => new Tuple<double, RoundedDouble>(
                                                                           c.Value, GetCalculationResult(
-                                                                              c.Key.ToDictionary(x => x.HydraulicBoundaryLocation,
-                                                                                                 x => x)[location].Output)))
+                                                                              c.Key.Single(x => x.HydraulicBoundaryLocation
+                                                                                                 .Equals(location))
+                                                                               .Output)))
                                                               .ToArray()))
                             .ToArray();
         }
Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Factories/AggregatedDuneLocationFactory.cs
===================================================================
diff -u -r9da286bdadcc91a4650bb2cbe051e03452967abb -rbf930d525aab06cc3f2602a58f1049279cbfc08a
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Factories/AggregatedDuneLocationFactory.cs	(.../AggregatedDuneLocationFactory.cs)	(revision 9da286bdadcc91a4650bb2cbe051e03452967abb)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Factories/AggregatedDuneLocationFactory.cs	(.../AggregatedDuneLocationFactory.cs)	(revision bf930d525aab06cc3f2602a58f1049279cbfc08a)
@@ -58,9 +58,8 @@
                                 {
                                     Tuple<double, DuneLocationCalculation>[] calculationsForLocation =
                                         calculationsForTargetProbabilities.Select(c => new Tuple<double, DuneLocationCalculation>(
-                                                                                      c.TargetProbability, c.DuneLocationCalculations.ToDictionary(
-                                                                                          x => x.DuneLocation,
-                                                                                          x => x)[location]))
+                                                                                      c.TargetProbability, c.DuneLocationCalculations.Single(
+                                                                                          tp => tp.DuneLocation.Equals(location))))
                                                                           .ToArray();
                                     return new AggregatedDuneLocation(
                                         location.Id, location.Name, location.Location, location.CoastalAreaId, location.Offset, location.D50,