diff --git a/NewHorizons/Patches/CharacterDialogueTreePatches.cs b/NewHorizons/Patches/CharacterDialogueTreePatches.cs
index 20bcaa3a..2d4a8831 100644
--- a/NewHorizons/Patches/CharacterDialogueTreePatches.cs
+++ b/NewHorizons/Patches/CharacterDialogueTreePatches.cs
@@ -3,19 +3,24 @@ using HarmonyLib;
 namespace NewHorizons.Patches;
 
 [HarmonyPatch]
-internal class CharacterDialogueTreePatches
+internal static class CharacterDialogueTreePatches
 {
     [HarmonyPrefix]
     [HarmonyPatch(typeof(CharacterDialogueTree), nameof(CharacterDialogueTree.Awake))]
     private static void CharacterDialogueTree_Awake(CharacterDialogueTree __instance)
     {
-        GlobalMessenger<OWRigidbody>.AddListener("AttachPlayerToPoint", _ => __instance.EndConversation());
+        GlobalMessenger<OWRigidbody>.AddListener("AttachPlayerToPoint", __instance.OnAttachPlayerToPoint);
     }
 
     [HarmonyPrefix]
     [HarmonyPatch(typeof(CharacterDialogueTree), nameof(CharacterDialogueTree.OnDestroy))]
     private static void CharacterDialogueTree_OnDestroy(CharacterDialogueTree __instance)
     {
-        GlobalMessenger<OWRigidbody>.RemoveListener("AttachPlayerToPoint", _ => __instance.EndConversation());
+        GlobalMessenger<OWRigidbody>.RemoveListener("AttachPlayerToPoint", __instance.OnAttachPlayerToPoint);
+    }
+
+    private static void OnAttachPlayerToPoint(this CharacterDialogueTree characterDialogueTree, OWRigidbody rigidbody)
+    {
+        characterDialogueTree.EndConversation();
     }
 }