Index: leahi_dialin/fp/modules/events.py
===================================================================
diff -u -r979d1b0306253b980d6ac01dd6fcf632eef2145a -r22338b079fc9509217fc90488a5a5a4b7b096dd1
--- leahi_dialin/fp/modules/events.py	(.../events.py)	(revision 979d1b0306253b980d6ac01dd6fcf632eef2145a)
+++ leahi_dialin/fp/modules/events.py	(.../events.py)	(revision 22338b079fc9509217fc90488a5a5a4b7b096dd1)
@@ -223,20 +223,20 @@
                     # In case the Op Mode Change is older then the previous Sub Mode Change,
                     # use the current Op Mode from the previous Op Mode Change message for both data
                     if prev_op_mode_timestamp <= prev_sub_mode_timestamp:
-                        event_data_1 = self._op_mode_2_sub_mode[last_op_mode_message[3]]
-                        event_data_2 = self._op_mode_2_sub_mode[last_op_mode_message[3]]
+                        event_data_1 = self._op_mode_2_sub_mode[last_op_mode_message[3]](event_data_1).name
+                        event_data_2 = self._op_mode_2_sub_mode[last_op_mode_message[3]](event_data_2).name
                     
                     # In case the Op Mode Change is newer then the previous Sub Mode Change,
                     # use the operation mode informations from the last Op Mode Change message
                     else:
-                        event_data_1 = self._op_mode_2_sub_mode[last_op_mode_message[2]]
-                        event_data_2 = self._op_mode_2_sub_mode[last_op_mode_message[3]]
+                        event_data_1 = self._op_mode_2_sub_mode[last_op_mode_message[2]](event_data_1).name
+                        event_data_2 = self._op_mode_2_sub_mode[last_op_mode_message[3]](event_data_2).name
                 
                 # In case this is the very first Sub Mode Change message,
                 # use the operation mode informations from the last Op Mode Change message
                 else:
-                    event_data_1 = self._op_mode_2_sub_mode[last_op_mode_message[2]]
-                    event_data_2 = self._op_mode_2_sub_mode[last_op_mode_message[3]]
+                    event_data_1 = self._op_mode_2_sub_mode[last_op_mode_message[2]](event_data_1).name
+                    event_data_2 = self._op_mode_2_sub_mode[last_op_mode_message[3]](event_data_2).name
 
             # In case there are no Op Mode Change messages, use the Operations States messages
             # to identify the Op Modes for the Sub Modes
@@ -276,8 +276,8 @@
                     event_1_op_mode = fp_enum_repository.FPOpModes.MODE_STAN.name
 
                 # Update the event_data values
-                event_data_1 = self._op_mode_2_sub_mode[event_1_op_mode]
-                event_data_2 = self._op_mode_2_sub_mode[event_2_op_mode]
+                event_data_1 = self._op_mode_2_sub_mode[event_1_op_mode](event_data_1).name
+                event_data_2 = self._op_mode_2_sub_mode[event_2_op_mode](event_data_2).name
             
             # Update the tuple
             event_tuple = (current_timestamp, event_enum.name, event_data_1, event_data_2)