Index: trunk/autoquest-core-usability/src/main/java/de/ugoe/cs/autoquest/usability/DataEntryMethodChangeRule.java
===================================================================
--- trunk/autoquest-core-usability/src/main/java/de/ugoe/cs/autoquest/usability/DataEntryMethodChangeRule.java	(revision 1959)
+++ trunk/autoquest-core-usability/src/main/java/de/ugoe/cs/autoquest/usability/DataEntryMethodChangeRule.java	(revision 1960)
@@ -92,5 +92,5 @@
      */
     private Map<ITask, Integer> getDataEntryMethodChangeRatios(Collection<ITask> tasks) {
-        Map<ITask, Integer> impatienceRatios = new HashMap<ITask, Integer>();
+        Map<ITask, Integer> methodChangeRatios = new HashMap<ITask, Integer>();
         
         for (ITask task : tasks) {
@@ -99,10 +99,10 @@
                 
                 if (ratio > 0) {
-                    impatienceRatios.put(task, ratio);
+                    methodChangeRatios.put(task, ratio);
                 }
             }
         }
         
-        return impatienceRatios;
+        return methodChangeRatios;
     }
 
@@ -142,10 +142,9 @@
 
             for (IEventTaskInstance current : terminalNodes) {
-                if (previous == null) {
-                    previous = current;
-                }
-                else if (dataEntryMethodChanges(previous, current)) {
+                if ((previous != null) && (dataEntryMethodChanges(previous, current))) {
                     changeCount++;
                 }
+                
+                previous = current;
             }