diff --git a/src/docs/asciidoc/app-structure.asc b/src/docs/asciidoc/app-structure.asc
index 01d6ad7..52ae2c9 100644
--- a/src/docs/asciidoc/app-structure.asc
+++ b/src/docs/asciidoc/app-structure.asc
@@ -724,9 +724,14 @@ public class Notifications {
 
         List<SubscriberObject> subscriberList = instance.subscribers.get( event );
 
-        if (subscriberList == null) {
-            subscriberList.remove( subscriber );
-        }
+        if (subscriberList != null) {
+		for(SubscriberObject sObj : subscriberList) {
+			if(sObj.getSubscriber().equals(subscriber)) {
+				subscriberList.remove(sObj);
+			}
+		}
+	}
+        
     }
 
     static class SubscriberObject {
@@ -755,7 +760,13 @@ public class Notifications {
 
         @Override
         public boolean equals(Object obj) {
-            return subscriber.equals(obj);
+            if(!(obj instanceof SubscriberObject)) {
+	    	return false;
+	    }
+	    else {
+	    	SubscriberObject otherSObj = (SubscriberObject) obj;
+		return Objects.equals(subscriber, otherSObj.subscriber);
+	    }
         }
     }
 }