diff --git a/src/engine/net/client/handlers/MoveToPointHandler.java b/src/engine/net/client/handlers/MoveToPointHandler.java
index 3c82d07b..1de2eac0 100644
--- a/src/engine/net/client/handlers/MoveToPointHandler.java
+++ b/src/engine/net/client/handlers/MoveToPointHandler.java
@@ -31,6 +31,8 @@ public class MoveToPointHandler extends AbstractClientMsgHandler {
         if (pc == null)
             return false;
 
+        pc.setIsCasting(false);
+        pc.setItemCasting(false);
         MovementManager.movement(msg, pc);
         return true;
     }
diff --git a/src/engine/objects/PlayerCharacter.java b/src/engine/objects/PlayerCharacter.java
index 9d125df4..2559fb68 100644
--- a/src/engine/objects/PlayerCharacter.java
+++ b/src/engine/objects/PlayerCharacter.java
@@ -5153,10 +5153,19 @@ public class PlayerCharacter extends AbstractCharacter {
 
                 try {
 
-                    if (!this.isAlive())
+                    if (!this.isAlive()) {
+                        if(this.isMoving())
+                            this.stopMovement(this.getMovementLoc());
                         return;
-
-                    this.updateLocation();
+                    }
+                    //this.updateLocation();
+                    if(this.isMoving()){
+                        this.setLoc(this.getMovementLoc());
+                        this.region = Regions.GetRegionForTeleport(this.getMovementLoc());
+                    }else{
+                        this.setLoc(this.loc);
+                        this.region = Regions.GetRegionForTeleport(this.loc);
+                    }
                     this.updateMovementState();
                     this.doRegen();