diff --git a/src/event_handler_handle_event.c b/src/event_handler_handle_event.c
index d6bec95..08ddd96 100644
--- a/src/event_handler_handle_event.c
+++ b/src/event_handler_handle_event.c
@@ -38,7 +38,8 @@ TR_eventHandlerHandleEvent(TR_EventHandler this, TR_Event event)
 			TR_sdbm((unsigned char *)&event->id, sizeof(event->id)));
 
 	TR_loggerLog(TR_logger, TR_LOGGER_DEBUG,
-			"HANDLE: %s event on %p with no. %d",
+			"%zd - HANDLE: %s event on %p with no. %d",
+			this->dispatcher[0]->events->nmsg,
 			TR_getEventString(event),
 			event->subject,
 			event->serial);
diff --git a/src/event_handler_issue_event.c b/src/event_handler_issue_event.c
index 5e98a29..60f540c 100644
--- a/src/event_handler_issue_event.c
+++ b/src/event_handler_issue_event.c
@@ -33,14 +33,15 @@ TR_eventHandlerIssueEvent(TR_EventHandler this, TR_Event event)
 	if (event) {
 		int i;
 
-		TR_loggerLog(TR_logger, TR_LOGGER_DEBUG,
-				"ISSUE: %s event on %p with no. %d",
-				TR_getEventString(event),
-				event->subject,
-				event->serial);
-
 		for (i=0; i<this->ndispatcher; i++) {
 			TR_eventDispatcherEnqueueEvent(this->dispatcher[i], event);
+
+			TR_loggerLog(TR_logger, TR_LOGGER_DEBUG,
+					"%zd - ISSUE: %s event on %p with no. %d",
+					this->dispatcher[i]->events->nmsg,
+					TR_getEventString(event),
+					event->subject,
+					event->serial);
 		}
 	}
 }