Index: trunk/FACT++/src/StateMachineDim.cc
===================================================================
--- trunk/FACT++/src/StateMachineDim.cc	(revision 10872)
+++ trunk/FACT++/src/StateMachineDim.cc	(revision 10873)
@@ -167,7 +167,4 @@
     const EventImp *evt = dynamic_cast<EventImp*>(cmd);
 
-    // FIXME: In the case of HandleEvent there is no need to copy the data
-    // FIMXE: Currentyl the time is not copied
-    // FIXME: Handle Event is not thread safe (Dim + Console)
     if (HasEvent(evt))
         PostEvent(*evt);
Index: trunk/FACT++/src/StateMachineImp.cc
===================================================================
--- trunk/FACT++/src/StateMachineImp.cc	(revision 10872)
+++ trunk/FACT++/src/StateMachineImp.cc	(revision 10873)
@@ -316,5 +316,6 @@
         // FIXME: Is this thread safe? (Yes, because the data is copied)
         // But two handlers could be called at the same time. Do we
-        // need to lock the handlers?
+        // need to lock the handlers? (Dim + console)
+        // FIXME: Is copying of the data necessary?
         const Event event(evt, ptr, siz);
         HandleEvent(event);
@@ -456,9 +457,5 @@
 {
     // Find the event from the list of commands and queue it
-    for (vector<EventImp*>::const_iterator c=fListOfEvents.begin(); c!=fListOfEvents.end(); c++)
-        if (*c == cmd)
-            return true;
-
-    return false;
+    return find(fListOfEvents.begin(), fListOfEvents.end(), cmd)!=fListOfEvents.end();
 }