diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 967e68d0d6..21e5642a4c 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -5,6 +5,11 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.  EV
 GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
 
 2006/02/02
+	* Crash fix in npc.c npc_timerevent.
+	  was: struct timer_event_data *ted = (struct timer_event_data*)ted;
+	  changed: 	struct timer_event_data *ted = (struct timer_event_data*)data;
+	  Skotlex, I am assuming it's calling from the passed data var, If I'm wrong
+	  please fix it.  I just know what was there was definitely not correct. [Valaris]
 	* Improved the NPC timer system to enable multiple timers going on at a
 	  time with different players attached to each. Now npc event timers are of
 	  two types: attached or global. The global timers don't have a player
diff --git a/src/map/npc.c b/src/map/npc.c
index b56fcd6059..e3517458b5 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -560,7 +560,7 @@ int npc_timerevent(int tid,unsigned int tick,int id,int data)
 	unsigned int old_tick;
 	struct npc_data* nd=(struct npc_data *)map_id2bl(id);
 	struct npc_timerevent_list *te;
-	struct timer_event_data *ted = (struct timer_event_data*)ted;
+	struct timer_event_data *ted = (struct timer_event_data*)data;
 	struct map_session_data *sd=NULL;
 	
 	if( nd==NULL ){