diff --git a/Assets/Scripts/Runtime/Characters/Player/Classes/MeleeFighterClass.cs b/Assets/Scripts/Runtime/Characters/Player/Classes/MeleeFighterClass.cs
index 6cba551..23f66fa 100644
--- a/Assets/Scripts/Runtime/Characters/Player/Classes/MeleeFighterClass.cs
+++ b/Assets/Scripts/Runtime/Characters/Player/Classes/MeleeFighterClass.cs
@@ -196,7 +196,8 @@ public class MeleeFighterClass : ClassBase {
         break;
 
       case AttackState.BladeVortex:
-        Animator.CrossFade(BladeVortex, 0);
+        AnimationToPlay = "BladeVortex_";
+        //Animator.CrossFade(BladeVortex, 0);
         break;
 
       case AttackState.BasicAttack1:
diff --git a/Assets/Scripts/Runtime/Characters/Player/PlayerMainController.cs b/Assets/Scripts/Runtime/Characters/Player/PlayerMainController.cs
index eb9bc0a..0c0f297 100644
--- a/Assets/Scripts/Runtime/Characters/Player/PlayerMainController.cs
+++ b/Assets/Scripts/Runtime/Characters/Player/PlayerMainController.cs
@@ -158,7 +158,11 @@ public class Player : MonoBehaviour {
 
   private void UpdateAnimation() {
     string state = GetAnimationState(MoveDirection);
-    Animator.CrossFade($"{state}{LastDirection.ToString()}", 0);
+    if (state.Last() == '_')
+      state = state.Replace("_", "");
+    else
+      state += LastDirection.ToString();
+    Animator.CrossFade(state, 0);
   }
 
   private enum Direction { Up, Down, Left, Right }