diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index ca4543f8e9..af731ee4d7 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,9 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2006/10/20
+	* Made HAMI_CASTLE use clif_slide rather than clif_fixpos. This should
+	  fix clientside problems when castling between two positions the (client)
+	  path finding can't find a walkable bath between anymore. [blackhole89]
 	* Fixed the Homunc not spawning next to you after receiving it's data from
 	  the char-server. [Skotlex]
 	* Fixed Charge Atk being able to go through chasm/pits. [Skotlex]
diff --git a/src/map/skill.c b/src/map/skill.c
index d3bbb56174..de0f9518b7 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -5466,11 +5466,11 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 
 			if (unit_movepos(src,bl->x,bl->y,0,0)) {
 				clif_skill_nodamage(src,src,skillid,skilllv,1); // Homunc
-				clif_fixpos(src) ;
+				clif_slide(src,bl->x,bl->y) ;
 				if (unit_movepos(bl,x,y,0,0))
 				{
 					clif_skill_nodamage(bl,bl,skillid,skilllv,1); // Master
-					clif_fixpos(bl) ;
+					clif_slide(bl,x,y) ;
 				}
 
 				//TODO: Shouldn't also players and the like switch targets?