diff --git a/include/tr/event_handler.h b/include/tr/event_handler.h
index ac49858..6a0856f 100644
--- a/include/tr/event_handler.h
+++ b/include/tr/event_handler.h
@@ -47,7 +47,7 @@ TR_CLASSVARS_DECL(TR_EventHandler) {
 };
 
 void TR_eventHandlerSetDispatcher(TR_EventHandler, TR_EventDispatcher);
-void TR_eventHandlerIssueEvent(TR_EventHandler, TR_EventSubject, int, void *);
+void TR_eventHandlerIssueEvent(TR_EventHandler, TR_Event);
 int  TR_eventHandlerHandleEvent(TR_EventHandler, TR_Event);
 
 #define TR_eventHandlerClassCleanup(cname) \
diff --git a/src/event_handler_issue_event.c b/src/event_handler_issue_event.c
index 5e8bb54..59afbee 100644
--- a/src/event_handler_issue_event.c
+++ b/src/event_handler_issue_event.c
@@ -24,16 +24,10 @@
 
 #include "tr/event.h"
 #include "tr/event_handler.h"
-#include "tr/event_subject.h"
 
 void
-TR_eventHandlerIssueEvent(
-		TR_EventHandler this,
-		TR_EventSubject subject,
-		int idx,
-		void * data)
+TR_eventHandlerIssueEvent(TR_EventHandler this, TR_Event event)
 {
-	TR_Event event = TR_eventSubjectEmit(subject, idx, data);
 	int      i;
 
 	for (i=0; i<this->ndispatcher; i++) {