diff --git a/MinecraftClient/ChatBot.cs b/MinecraftClient/ChatBot.cs
index 5b338086..ec9b1cbf 100644
--- a/MinecraftClient/ChatBot.cs
+++ b/MinecraftClient/ChatBot.cs
@@ -145,7 +145,7 @@ namespace MinecraftClient
 
         public virtual void OnEntitySpawn(Mapping.Entity entity) { }
 
-        public virtual void OnEntityDespawn(int EntityID) { }
+        public virtual void OnEntityDespawn(Mapping.Entity entity) { }
 
 
         /* =================================================================== */
diff --git a/MinecraftClient/ChatBots/AutoAttack.cs b/MinecraftClient/ChatBots/AutoAttack.cs
index d65f8ab7..2f03d26c 100644
--- a/MinecraftClient/ChatBots/AutoAttack.cs
+++ b/MinecraftClient/ChatBots/AutoAttack.cs
@@ -22,7 +22,7 @@ namespace MinecraftClient.ChatBots
             if (!GetEntityHandlingEnabled())
             {
                 ConsoleIO.WriteLine("[AutoAttack] Entity Handling is not enabled in the config file!");
-                ConsoleIO.WriteLine("Please enable it to use this bot.");
+                ConsoleIO.WriteLine("[AutoAttack] This bot will be unloaded.");
                 UnloadBot();
             }
         }
@@ -53,11 +53,11 @@ namespace MinecraftClient.ChatBots
                 entitiesToTrack.Add(entity.ID, entity);
             }
         }
-        public override void OnEntityDespawn(int EntityID)
+        public override void OnEntityDespawn(Entity entity)
         {
-            if (entitiesToTrack.ContainsKey(EntityID))
+            if (entitiesToTrack.ContainsKey(entity.ID))
             {
-                entitiesToTrack.Remove(EntityID);
+                entitiesToTrack.Remove(entity.ID);
             }
         }
         public override void OnEntityMove(Entity entity)
diff --git a/MinecraftClient/ChatBots/AutoFishing.cs b/MinecraftClient/ChatBots/AutoFishing.cs
index 6262a209..94567318 100644
--- a/MinecraftClient/ChatBots/AutoFishing.cs
+++ b/MinecraftClient/ChatBots/AutoFishing.cs
@@ -20,7 +20,7 @@ namespace MinecraftClient.ChatBots
             if (!GetEntityHandlingEnabled())
             {
                 ConsoleIO.WriteLine("[AutoFishing] Entity Handling is not enabled in the config file!");
-                ConsoleIO.WriteLine("Please enable it to use this bot.");
+                ConsoleIO.WriteLine("[AutoFishing] This bot will be unloaded.");
                 UnloadBot();
             }
         }
@@ -60,8 +60,7 @@ namespace MinecraftClient.ChatBots
                 fishingRod[entity.ID] = entity;
             }
         }
-
-        // TODO: Move into ChatBot
+        
         /// <summary>
         /// Called when detected a fish is caught
         /// </summary>
diff --git a/MinecraftClient/McTcpClient.cs b/MinecraftClient/McTcpClient.cs
index b2c69133..128e1d13 100644
--- a/MinecraftClient/McTcpClient.cs
+++ b/MinecraftClient/McTcpClient.cs
@@ -1115,12 +1115,12 @@ namespace MinecraftClient
         {
             foreach (int a in Entities)
             {
+                foreach (ChatBot bot in bots.ToArray())
+                    bot.OnEntityDespawn(new Entity(entities[a].ID, entities[a].Type, entities[a].Location));
                 if (entities.ContainsKey(a))
                 {
                     entities.Remove(a);
                 }
-                foreach (ChatBot bot in bots.ToArray())
-                    bot.OnEntityDespawn(a);
             }
         }