diff --git a/Content/BPML_StateMacros.uasset b/Content/BPML_StateMacros.uasset
index ac8e0d8..092c1de 100644
Binary files a/Content/BPML_StateMacros.uasset and b/Content/BPML_StateMacros.uasset differ
diff --git a/Source/UnrealFightingFramework/State/FFStateMachineComponent.cpp b/Source/UnrealFightingFramework/State/FFStateMachineComponent.cpp
index 16a0993..b942bbf 100644
--- a/Source/UnrealFightingFramework/State/FFStateMachineComponent.cpp
+++ b/Source/UnrealFightingFramework/State/FFStateMachineComponent.cpp
@@ -115,9 +115,9 @@ void UFFStateMachineComponent::GoToState(UFFState* NewState)
 
     CurrentState->Exit(GetCurrentStateContext());
     CurrentState = NewState;
-    CurrentState->Enter(GetCurrentStateContext());
     TicksInState = 0;
     CurrentSubStateLabel = NAME_None;
+    CurrentState->Enter(GetCurrentStateContext());
 }
 
 void UFFStateMachineComponent::GoToEntryState()
diff --git a/Source/UnrealFightingFramework/State/FFStateMachineComponent.h b/Source/UnrealFightingFramework/State/FFStateMachineComponent.h
index 11aed2d..38c990e 100644
--- a/Source/UnrealFightingFramework/State/FFStateMachineComponent.h
+++ b/Source/UnrealFightingFramework/State/FFStateMachineComponent.h
@@ -94,7 +94,7 @@ public:
 	FORCEINLINE FName GetCurrentSubStateLabel() const;
 
 	UFUNCTION(BlueprintCallable)
-	FORCEINLINE void SetSubStateLabel(FName InSubStateLabel);
+	void SetSubStateLabel(FName InSubStateLabel);
 
     /**
 	 *