Index: /trunk/EventBenchCore/src/de/ugoe/cs/eventbench/data/Event.java
===================================================================
--- /trunk/EventBenchCore/src/de/ugoe/cs/eventbench/data/Event.java	(revision 390)
+++ /trunk/EventBenchCore/src/de/ugoe/cs/eventbench/data/Event.java	(revision 391)
@@ -98,9 +98,9 @@
 			if (otherEvent.canEqual(this)) {
 				if (type != null) {
-					return type.equals(otherEvent.type)
-							&& targetEquals(otherEvent.target);
+					return targetEquals(otherEvent.target)
+							&& type.equals(otherEvent.type);
 				} else {
-					return otherEvent.type == null
-							&& targetEquals(otherEvent.target);
+					return targetEquals(otherEvent.target)
+							&& otherEvent.type == null;
 				}
 			} else {
Index: /trunk/EventBenchCore/src/de/ugoe/cs/eventbench/models/TrieBasedModel.java
===================================================================
--- /trunk/EventBenchCore/src/de/ugoe/cs/eventbench/models/TrieBasedModel.java	(revision 390)
+++ /trunk/EventBenchCore/src/de/ugoe/cs/eventbench/models/TrieBasedModel.java	(revision 391)
@@ -163,6 +163,4 @@
 				context.add(Event.STARTEVENT);
 
-				Event<?> currentState = Event.STARTEVENT;
-
 				while (!endFound && sequence.size() < maxLength) {
 					double randVal = r.nextDouble();
@@ -176,6 +174,5 @@
 								// START or END
 								context.add(symbol);
-								currentState = symbol;
-								sequence.add(currentState);
+								sequence.add(symbol);
 							}
 							endFound = (symbol == Event.ENDEVENT)