diff --git a/1-base/lace/source/events/mixin/lace-make_subject.adb b/1-base/lace/source/events/mixin/lace-make_subject.adb
index 8387413..2105a41 100644
--- a/1-base/lace/source/events/mixin/lace-make_subject.adb
+++ b/1-base/lace/source/events/mixin/lace-make_subject.adb
@@ -15,7 +15,12 @@ is
    begin
       if Self.Emitter /= null
       then
-         Self.Emitter.destruct;
+         Self.Emitter.destroy;
+      end if;
+
+      if Self.Sender /= null
+      then
+         Self.Sender.destroy;
       end if;
 
       Self.safe_Observers.destruct;