diff --git a/Source/Editor/GUI/Timeline/Tracks/EventTrack.cs b/Source/Editor/GUI/Timeline/Tracks/EventTrack.cs
index 1275a8328..f5239831f 100644
--- a/Source/Editor/GUI/Timeline/Tracks/EventTrack.cs
+++ b/Source/Editor/GUI/Timeline/Tracks/EventTrack.cs
@@ -288,8 +288,8 @@ namespace FlaxEditor.GUI.Timeline.Tracks
             Events.Visible = Visible;
             if (!Visible)
             {
-                if(wasVisible)
-                Events.ClearSelection();
+                if (wasVisible)
+                    Events.ClearSelection();
                 return;
             }
             Events.KeyframesEditorContext = Timeline;
diff --git a/Source/Engine/Animations/SceneAnimations/SceneAnimationPlayer.cpp b/Source/Engine/Animations/SceneAnimations/SceneAnimationPlayer.cpp
index cc61c1bdc..5ed3e7057 100644
--- a/Source/Engine/Animations/SceneAnimations/SceneAnimationPlayer.cpp
+++ b/Source/Engine/Animations/SceneAnimations/SceneAnimationPlayer.cpp
@@ -19,7 +19,6 @@
 #include "Engine/Scripting/ManagedCLR/MType.h"
 #include "Engine/Scripting/ManagedCLR/MField.h"
 #include "Engine/Scripting/ManagedCLR/MClass.h"
-#include "Engine/Scripting/ManagedCLR/MMethod.h"
 
 // This could be Update, LateUpdate or FixedUpdate
 #define UPDATE_POINT Update
@@ -274,7 +273,7 @@ void SceneAnimationPlayer::Restore(SceneAnimation* anim, int32 stateIndexOffset)
         case SceneAnimation::Track::Types::CameraCut:
         {
             auto& state = _tracks[stateIndexOffset + track.TrackStateIndex];
-            state.ManagedObject = state.Object ? state.Object.GetOrCreateManagedInstance() : nullptr;
+            state.ManagedObject = state.Object.GetOrCreateManagedInstance();
             break;
         }
         case SceneAnimation::Track::Types::KeyframesProperty:
@@ -947,26 +946,7 @@ void SceneAnimationPlayer::Tick(SceneAnimation* anim, float time, float dt, int3
             if (track.ParentIndex == -1)
                 break;
             const auto runtimeData = track.GetRuntimeData<SceneAnimation::EventTrack::Runtime>();
-            auto& state = _tracks[stateIndexOffset + track.TrackStateIndex];
-            const auto& parentTrack = anim->Tracks[track.ParentIndex];
-
-            // Skip if parent object is missing
-            MonoObject* instance = _tracks[stateIndexOffset + parentTrack.TrackStateIndex].ManagedObject;
-            if (!instance)
-                break;
-
-            // Cache method
-            if (!state.Method)
-            {
-                MClass* mclass = Scripting::FindClass(mono_object_get_class(instance));
-                state.Method = mclass->GetMethod(runtimeData->EventName, runtimeData->EventParamsCount);
-
-                // Skip if method is missing
-                if (!state.Method)
-                    break;
-            }
-
-            void* params[SceneAnimation::EventTrack::MaxParams];
+            void* paramsData[SceneAnimation::EventTrack::MaxParams];
 
             // Check if hit any event key since the last update
             float lastTime = time - dt;
@@ -994,18 +974,34 @@ void SceneAnimationPlayer::Tick(SceneAnimation* anim, float time, float dt, int3
                     ptr += sizeof(float);
                     for (int32 paramIndex = 0; paramIndex < runtimeData->EventParamsCount; paramIndex++)
                     {
-                        params[paramIndex] = (void*)ptr;
+                        paramsData[paramIndex] = (void*)ptr;
                         ptr += runtimeData->EventParamSizes[paramIndex];
                     }
 
-                    // Invoke the method
-                    MonoObject* exception = nullptr;
-                    // TODO: use method thunk
-                    state.Method->Invoke(instance, params, &exception);
-                    if (exception)
+                    auto& state = _tracks[stateIndexOffset + track.TrackStateIndex];
+                    const auto& parentTrack = anim->Tracks[track.ParentIndex];
+                    auto& parentTrackState = _tracks[stateIndexOffset + parentTrack.TrackStateIndex];
+                    if (parentTrackState.ManagedObject)
                     {
-                        MException ex(exception);
-                        ex.Log(LogType::Error, TEXT("Event"));
+                        auto instance = parentTrackState.ManagedObject;
+
+                        // Cache method
+                        if (!state.Method)
+                        {
+                            state.Method = mono_class_get_method_from_name(mono_object_get_class(instance), runtimeData->EventName, runtimeData->EventParamsCount);
+                            if (!state.Method)
+                                break;
+                        }
+
+                        // Invoke the method
+                        Variant result;
+                        MonoObject* exception = nullptr;
+                        mono_runtime_invoke((MonoMethod*)state.Method, instance, paramsData, &exception);
+                        if (exception)
+                        {
+                            MException ex(exception);
+                            ex.Log(LogType::Error, TEXT("Event"));
+                        }
                     }
                 }
                 else
diff --git a/Source/Engine/Animations/SceneAnimations/SceneAnimationPlayer.h b/Source/Engine/Animations/SceneAnimations/SceneAnimationPlayer.h
index 9e66825ca..5d7d4737b 100644
--- a/Source/Engine/Animations/SceneAnimations/SceneAnimationPlayer.h
+++ b/Source/Engine/Animations/SceneAnimations/SceneAnimationPlayer.h
@@ -46,7 +46,7 @@ private:
         MonoObject* ManagedObject = nullptr;
         MProperty* Property = nullptr;
         MField* Field = nullptr;
-        MMethod* Method = nullptr;
+        void* Method = nullptr;
         int32 RestoreStateIndex = -1;
 
         TrackInstance()
diff --git a/Source/Engine/Level/SceneObject.h b/Source/Engine/Level/SceneObject.h
index 80be46c21..387cbbc13 100644
--- a/Source/Engine/Level/SceneObject.h
+++ b/Source/Engine/Level/SceneObject.h
@@ -195,7 +195,7 @@ public:
     /// </summary>
     /// <param name="prefabId">The prefab asset identifier.</param>
     /// <param name="prefabObjectId">The prefab object identifier.</param>
-    API_FUNCTION() virtual void LinkPrefab(const Guid& prefabId, const Guid& prefabObjectId);
+    API_FUNCTION(Attributes="NoAnimate") virtual void LinkPrefab(const Guid& prefabId, const Guid& prefabObjectId);
 
     /// <summary>
     /// Breaks the prefab linkage for this object, all its scripts, and all child actors.