diff --git a/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/ShowcaseUmlTests.java b/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/ShowcaseUmlTests.java
index 3707b57b..b435afaa 100644
--- a/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/ShowcaseUmlTests.java
+++ b/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/ShowcaseUmlTests.java
@@ -106,8 +106,8 @@ public class ShowcaseUmlTests extends AbstractBuildTests {
 						.expectStates("S0", "S2", "S21", "S211").and()
 					.step()
 						.sendEvent("H")
-						.expectVariable("foo", 0)
-						.expectTransition(0)
+						.expectVariable("foo", 1)
+						.expectTransition(1)
 						.expectStates("S0", "S2", "S21", "S211").and()
 					.step()
 						.sendEvent("K")
@@ -115,9 +115,9 @@ public class ShowcaseUmlTests extends AbstractBuildTests {
 						.expectStates("S0", "S1", "S11").and()
 					.step()
 						.sendEvent("A")
-						.expectStateChanged(0)
-						.expectStateEntered(0)
-						.expectStateExited(0)
+						.expectStateChanged(2)
+						.expectStateEntered(2)
+						.expectStateExited(2)
 						.expectStates("S0", "S1", "S11").and()
 					.build();
 		plan.test();
@@ -286,8 +286,8 @@ public class ShowcaseUmlTests extends AbstractBuildTests {
 						.expectStates("S0", "S2", "S21", "S211").and()
 					.step()
 						.sendEvent("H")
-						.expectVariable("foo", 0)
-						.expectTransition(0)
+						.expectVariable("foo", 1)
+						.expectTransition(1)
 						.expectStates("S0", "S2", "S21", "S211").and()
 					.build();
 		plan.test();
@@ -315,8 +315,8 @@ public class ShowcaseUmlTests extends AbstractBuildTests {
 						.expectStates("S0", "S2", "S21", "S211").and()
 					.step()
 						.sendEvent("H")
-						.expectVariable("foo", 0)
-						.expectTransition(0)
+						.expectVariable("foo", 1)
+						.expectTransition(1)
 						.expectStates("S0", "S2", "S21", "S211").and()
 					.build();
 		plan.test();
diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/DefaultStateMachineExecutor.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/DefaultStateMachineExecutor.java
index 677d2a07..bbb2277b 100644
--- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/DefaultStateMachineExecutor.java
+++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/DefaultStateMachineExecutor.java
@@ -366,8 +366,8 @@ public class DefaultStateMachineExecutor<S, E> extends LifecycleObjectSupport im
 						Trigger<S, E> tri = e.getKey();
 						E ee = tri.getEvent();
 						Transition<S, E> tra = e.getValue();
-						if (event == ee) {
-							if (tra.getSource().getId() == id && !trans.contains(tra)) {
+						if (event.equals(ee)) {
+							if (tra.getSource().getId().equals(id) && !trans.contains(tra)) {
 								trans.add(tra);
 								continue;
 							}