Index: trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/gui/KeyInteractionTargetCorrector.java
===================================================================
--- trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/gui/KeyInteractionTargetCorrector.java	(revision 1399)
+++ trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/gui/KeyInteractionTargetCorrector.java	(revision 1432)
@@ -52,8 +52,9 @@
         
         for (Event event : sequence) {
+            Event nextEvent = event;
             if (event.getTarget() instanceof IGUIElement) {
                 if (event.getType() instanceof KeyboardFocusChange) {
                     currentKeyboardFocusGUIElement = (IGUIElement) event.getTarget();
-                    event = null;
+                    nextEvent = null;
                 }
                 else if (event.getType() instanceof KeyInteraction) {
@@ -63,11 +64,14 @@
                     
                     if (!currentKeyboardFocusGUIElement.equals(event.getTarget())) {
-                        event = new Event(event.getType(), currentKeyboardFocusGUIElement);
+                        nextEvent = new Event(event.getType(), currentKeyboardFocusGUIElement);
+                        nextEvent.setTimestamp(event.getTimestamp());
+                        
+                        // TODO copy event parameters
                     }
                 }
             }
             
-            if (event != null) {
-                resultingSequence.add(event);
+            if (nextEvent != null) {
+                resultingSequence.add(nextEvent);
             }
         }