diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/HarvesterNPC.java b/Plugin NPC/src/main/java/net/simon987/npcplugin/HarvesterNPC.java
index fc01e42..396a8e1 100644
--- a/Plugin NPC/src/main/java/net/simon987/npcplugin/HarvesterNPC.java	
+++ b/Plugin NPC/src/main/java/net/simon987/npcplugin/HarvesterNPC.java	
@@ -41,15 +41,17 @@ public class HarvesterNPC extends NonPlayerCharacter {
             //Self-destroy when age limit is reached
             if (getAge() >= NonPlayerCharacter.LIFETIME) {
                 setDead(true);
-                getFactory().getNpcs().remove(this);
             }
         }
     }
 
     @Override
     public void onDeadCallback() {
+
+        getFactory().getNpcs().remove(this);
+
         GameServer.INSTANCE.getEventDispatcher().dispatch(
-            new ObjectDeathEvent((Object)this, ID));
+                new ObjectDeathEvent(this, ID));
     }
 
     @Override