diff --git a/pom.xml b/pom.xml
index 9289e02..a1ec63b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>me.bvn13.fsm</groupId>
     <artifactId>fsm</artifactId>
-    <version>2.1.8</version>
+    <version>2.1.9</version>
 
     <packaging>jar</packaging>
 
diff --git a/src/main/java/me/bvn13/fsm/Fsm.java b/src/main/java/me/bvn13/fsm/Fsm.java
index 39b1a81..f724986 100644
--- a/src/main/java/me/bvn13/fsm/Fsm.java
+++ b/src/main/java/me/bvn13/fsm/Fsm.java
@@ -149,9 +149,9 @@ public class Fsm<T extends Fsm, E> {
             return;
         }
         currentState.process(event);
-        currentState.afterEvent();
         if (currentState.isFinish()) {
             done = true;
+            currentState.afterEvent();
             return;
         }
         switchToNextState(event);
@@ -278,6 +278,7 @@ public class Fsm<T extends Fsm, E> {
     }
 
     private void nextState(State<E> state, E event) {
+        currentState.afterEvent();
         previousState = currentState;
         currentState = state;
         currentState.beforeEvent();