diff --git a/src/event.c b/src/event.c
index 458b452..00707ac 100644
--- a/src/event.c
+++ b/src/event.c
@@ -46,7 +46,7 @@ static void eventDtor(void * _this)
 	TR_Event this = _this;
 
 	this->subject->emitted =
-		this->subject->emitted == 0 
+		this->subject->emitted == 0
 		? 0 : this->subject->emitted - 1;
 
 	if (0 == this->subject->emitted && this->subject->fin) {
diff --git a/src/event_dispatcher_register_handler.c b/src/event_dispatcher_register_handler.c
index 5c46539..6efb825 100644
--- a/src/event_dispatcher_register_handler.c
+++ b/src/event_dispatcher_register_handler.c
@@ -40,9 +40,10 @@ doRegister(const void * _node, const void * data)
 
 	if (handler_queue_hv) {
 		handler_queue = *(TR_Queue *)handler_queue_hv->value;
-	} else { 
+	} else {
 		handler_queue            = TR_new(TR_Queue);
 		handler_queue->free_msgs = 0;
+		// TODO change TR_Queue to TR_Dynarray as this is no queue.
 		handler_queue_hv         = TR_new(
 				TR_HashValue,
 				node->key,
diff --git a/src/event_dispatcher_start.c b/src/event_dispatcher_start.c
index 6080760..a36b943 100644
--- a/src/event_dispatcher_start.c
+++ b/src/event_dispatcher_start.c
@@ -69,18 +69,18 @@ TR_eventDispatcherStart(TR_EventDispatcher this)
 			? *(TR_Queue *)handler_queue_hv->value
 			: NULL;
 
-		if (handler_queue && ! TR_queueEmpty(handler_queue)) {
-			TR_Queue     queue_node = handler_queue->first;
-			TR_EventDone done       = TR_EVENT_PENDING;
+		if (handler_queue) {
+			size_t       idx  = TR_queueFirst(handler_queue);
+			TR_EventDone done = TR_EVENT_PENDING;
 
-			while (queue_node) {
-				TR_EventHandler handler = queue_node->msg;
+			while (idx != TR_queueLast(handler_queue)) {
+				TR_EventHandler handler = handler_queue->data[idx];
 				TR_EventDone    this_done;
 
 				this_done = TR_eventHandlerHandleEvent(handler, event);
 				done = TR_EVENT_DONE == done ? done : this_done;
 
-				queue_node = queue_node->next;
+				idx = idx + 1 == TR_queueSize(handler_queue) ? 0 : idx + 1;
 			}
 
 			if (TR_EVENT_DONE == done) {
diff --git a/src/event_handler_handle_event.c b/src/event_handler_handle_event.c
index fa2b4ca..fa12ee1 100644
--- a/src/event_handler_handle_event.c
+++ b/src/event_handler_handle_event.c
@@ -39,7 +39,7 @@ TR_eventHandlerHandleEvent(TR_EventHandler this, TR_Event event)
 
 	TR_loggerLog(TR_logger, TR_LOGGER_DEBUG,
 			"%zd - HANDLE(%zd): %s event on %p with no. %d",
-			this->dispatcher[0]->events->nmsg,
+			TR_queueSize(this->dispatcher[0]->events),
 			event->subject->emitted,
 			TR_getEventString(event),
 			event->subject,
diff --git a/src/event_handler_issue_event.c b/src/event_handler_issue_event.c
index 1ef66f5..678da7f 100644
--- a/src/event_handler_issue_event.c
+++ b/src/event_handler_issue_event.c
@@ -38,7 +38,7 @@ TR_eventHandlerIssueEvent(TR_EventHandler this, TR_Event event)
 
 			TR_loggerLog(TR_logger, TR_LOGGER_DEBUG,
 					"%zd - ISSUE(%zd): %s event on %p with no. %d",
-					this->dispatcher[i]->events->nmsg,
+					TR_queueSize(this->dispatcher[i]->events),
 					event->subject->emitted,
 					TR_getEventString(event),
 					event->subject,