diff --git a/src/libmtime.f90 b/src/libmtime.f90
index df7cf6133783632e38aa2de759ab167768abb6ea..99fbc510ba8cb598c714b2ac1e31197e41dab0f8 100644
--- a/src/libmtime.f90
+++ b/src/libmtime.f90
@@ -1926,6 +1926,8 @@ module mtime_events
   integer, parameter :: max_event_str_len = 512
   !
   type, bind(c) :: event
+    ! FIXME (some day in the future): This derived type should not specify both - 
+    ! the linked list element and the element itself.
     type(c_ptr) :: nextEventInGroup
     integer(c_int64_t) :: eventId
     type(c_ptr) :: eventName
diff --git a/src/libmtime_hl.f90 b/src/libmtime_hl.f90
index 5661447b69174263e588bc59d02fc4429d34a292..4a66a6c682f21024dfaa6993280a819f227192c7 100644
--- a/src/libmtime_hl.f90
+++ b/src/libmtime_hl.f90
@@ -286,7 +286,8 @@ MODULE mtime_hl
   TYPE t_event
 
     !private
-
+    ! FIXME (some day in the future): This derived type should not specify both - 
+    ! the linked list element and the element itself.
     TYPE(t_event), POINTER               :: nextEventInGroup  
 
     INTEGER(c_int64_t)                   :: eventId
diff --git a/src/mtime_eventList.c b/src/mtime_eventList.c
index d23b776b42769ba766ba8838d578d632aa54405f..23e9927f247968185fecf05c94b0810f97f3b8f9 100644
--- a/src/mtime_eventList.c
+++ b/src/mtime_eventList.c
@@ -10,6 +10,9 @@
  * @note All functions in this file are internal.
  */
 
+
+// FIXME: This FILE is CALLed mtime_eventList.c, but the STRUCT as well the fortran TYPE is CALLed eventGroup!
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>