diff --git a/Assets/Scripts/Games/FanClub/NtrIdolFan.cs b/Assets/Scripts/Games/FanClub/NtrIdolFan.cs
index b29ddb523..a71e043ec 100644
--- a/Assets/Scripts/Games/FanClub/NtrIdolFan.cs
+++ b/Assets/Scripts/Games/FanClub/NtrIdolFan.cs
@@ -135,6 +135,7 @@ namespace HeavenStudio.Games.Scripts_FanClub
                 float yWeight = -(yMul*yMul) + 1f;
                 motionRoot.transform.localPosition = new Vector3(0, 3f * yWeight);
                 shadow.transform.localScale = new Vector3((1f-yWeight*0.8f) * 1.4f, (1f-yWeight*0.8f) * 1.4f, 1f);
+                animator.Play("FanJump", -1, 0);
             }
             else
             {
diff --git a/Assets/Scripts/Games/Minigame.cs b/Assets/Scripts/Games/Minigame.cs
index f2cfef122..118692bc5 100644
--- a/Assets/Scripts/Games/Minigame.cs
+++ b/Assets/Scripts/Games/Minigame.cs
@@ -130,9 +130,14 @@ namespace HeavenStudio.Games
         //Useful for strict call and responses games like Tambourine
         public bool IsExpectingInputNow()
         {
+            if (PlayerActionEvent.justHit) 
+            {
+                PlayerActionEvent.justHit = false;
+                return true;
+            }
             PlayerActionEvent input = GetClosestScheduledInput();
             if (input == null) return false;
-
+            // Debug.Log(input.IsExpectingInputNow());
             return input.IsExpectingInputNow();
         }
 
diff --git a/Assets/Scripts/Games/PlayerActionEvent.cs b/Assets/Scripts/Games/PlayerActionEvent.cs
index 83f2b2176..c6fafc568 100644
--- a/Assets/Scripts/Games/PlayerActionEvent.cs
+++ b/Assets/Scripts/Games/PlayerActionEvent.cs
@@ -52,6 +52,8 @@ namespace HeavenStudio.Games
             this.canHit = canHit;
         }
 
+        public static bool justHit = false;
+
         public void Update()
         {
             if(!Conductor.instance.NotStopped()){CleanUp();} // If the song is stopped entirely in the editor, destroy itself as we don't want duplicates
@@ -70,6 +72,7 @@ namespace HeavenStudio.Games
 
             if (IsCorrectInput() && !autoplayOnly)
             {
+                justHit = true;
                 if (state.perfect)
                 {
                     Hit(stateProg);
diff --git a/Assets/Scripts/Games/PlayerActionEvent.cs.meta b/Assets/Scripts/Games/PlayerActionEvent.cs.meta
index 0b76c9a62..d49398c04 100644
--- a/Assets/Scripts/Games/PlayerActionEvent.cs.meta
+++ b/Assets/Scripts/Games/PlayerActionEvent.cs.meta
@@ -4,7 +4,7 @@ MonoImporter:
   externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
-  executionOrder: -43
+  executionOrder: -42
   icon: {instanceID: 0}
   userData: 
   assetBundleName: 
diff --git a/Assets/Scripts/Games/PlayerActionObject.cs.meta b/Assets/Scripts/Games/PlayerActionObject.cs.meta
index 0b00cf0a8..5e3a2acf7 100644
--- a/Assets/Scripts/Games/PlayerActionObject.cs.meta
+++ b/Assets/Scripts/Games/PlayerActionObject.cs.meta
@@ -4,7 +4,7 @@ MonoImporter:
   externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
-  executionOrder: -42
+  executionOrder: 0
   icon: {instanceID: 0}
   userData: 
   assetBundleName: 
diff --git a/Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/SpecialTimeline.cs b/Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/SpecialTimeline.cs
index cd71e0061..4e68a185b 100644
--- a/Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/SpecialTimeline.cs
+++ b/Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/SpecialTimeline.cs
@@ -109,7 +109,7 @@ namespace HeavenStudio.Editor.Track
         {
             foreach (SpecialTimelineObj obj in specialTimelineObjs)
             {
-                obj.DeleteObj();
+                Destroy(obj.gameObject);
             }
             specialTimelineObjs.Clear();
         }