Index: Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/LocationCalculationsContext.cs
===================================================================
diff -u -rff0fd3d6f0a104e6ec6742279e0741984871d199 -r76df5cd9a64862ec2239dfcf6e539cd72f96b7e8
--- Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/LocationCalculationsContext.cs	(.../LocationCalculationsContext.cs)	(revision ff0fd3d6f0a104e6ec6742279e0741984871d199)
+++ Riskeer/Common/src/Riskeer.Common.Forms/PresentationObjects/LocationCalculationsContext.cs	(.../LocationCalculationsContext.cs)	(revision 76df5cd9a64862ec2239dfcf6e539cd72f96b7e8)
@@ -61,10 +61,14 @@
             }
 
             observers.Add(observer);
+
+            LocationCalculationsListToObserve.Attach(observer);
         }
 
         public virtual void Detach(IObserver observer)
         {
+            LocationCalculationsListToObserve.Detach(observer);
+
             observers.Remove(observer);
 
             if (!observers.Any())
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/PresentationObjects/LocationCalculationsContextTest.cs
===================================================================
diff -u -rff0fd3d6f0a104e6ec6742279e0741984871d199 -r76df5cd9a64862ec2239dfcf6e539cd72f96b7e8
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/PresentationObjects/LocationCalculationsContextTest.cs	(.../LocationCalculationsContextTest.cs)	(revision ff0fd3d6f0a104e6ec6742279e0741984871d199)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/PresentationObjects/LocationCalculationsContextTest.cs	(.../LocationCalculationsContextTest.cs)	(revision 76df5cd9a64862ec2239dfcf6e539cd72f96b7e8)
@@ -88,7 +88,7 @@
             // Given
             var mockRepository = new MockRepository();
             var observer = mockRepository.StrictMock<IObserver>();
-            observer.Expect(o => o.UpdateObserver());
+            observer.Expect(o => o.UpdateObserver()).Repeat.Any();
             mockRepository.ReplayAll();
 
             var locationCalculationsListToObserve = new ObservableList<IObservable>();