diff --git a/Code/TKStateMachine.m b/Code/TKStateMachine.m
index f17a8db..c08fdcb 100644
--- a/Code/TKStateMachine.m
+++ b/Code/TKStateMachine.m
@@ -224,8 +224,8 @@ - (BOOL)fireEvent:(id)eventOrEventName error:(NSError **)error
     if (oldState.willExitStateBlock) oldState.willExitStateBlock(oldState, self);
     if (newState.willEnterStateBlock) newState.willEnterStateBlock(newState, self);
     self.currentState = newState;
-    if (newState.didEnterStateBlock) newState.didEnterStateBlock(newState, self);
     if (oldState.didExitStateBlock) oldState.didExitStateBlock(oldState, self);
+    if (newState.didEnterStateBlock) newState.didEnterStateBlock(newState, self);
     
     if (event.didFireEventBlock) event.didFireEventBlock(event, self);