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 1431)
+++ /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);
             }
         }
Index: /trunk/autoquest-ui-core/src/main/java/de/ugoe/cs/autoquest/commands/sequences/CMDcorrectTabKeyNavigationOrder.java
===================================================================
--- /trunk/autoquest-ui-core/src/main/java/de/ugoe/cs/autoquest/commands/sequences/CMDcorrectTabKeyNavigationOrder.java	(revision 1431)
+++ /trunk/autoquest-ui-core/src/main/java/de/ugoe/cs/autoquest/commands/sequences/CMDcorrectTabKeyNavigationOrder.java	(revision 1432)
@@ -119,6 +119,16 @@
         while (index < sequence.size()) {
             if (mustCorrectTabKeyNavigationOrder(sequence, index)) {
-                result.add(sequence.get(index + 1));
-                result.add(sequence.get(index));
+                Event event1 = sequence.get(index);
+                Event event2 = sequence.get(index + 1);
+                
+                // switch timestamps
+                long timestamp1 = event1.getTimestamp();
+                event1.setTimestamp(event2.getTimestamp());
+                event2.setTimestamp(timestamp1);
+                
+                // change order of events
+                result.add(event2);
+                result.add(event1);
+                
                 index += 2;
             }