diff --git a/OpenRA.Mods.RA/Activities/Teleport.cs b/OpenRA.Mods.RA/Activities/Teleport.cs
index 41574dff81..b31610583d 100755
--- a/OpenRA.Mods.RA/Activities/Teleport.cs
+++ b/OpenRA.Mods.RA/Activities/Teleport.cs
@@ -24,7 +24,7 @@ namespace OpenRA.Mods.RA.Activities
 
 		public override IActivity Tick(Actor self)
 		{
-			self.TraitsImplementing<IMove>().FirstOrDefault().SetPosition(self, destination);
+			self.TraitsImplementing<ITeleportable>().FirstOrDefault().SetPosition(self, destination);
 			return NextActivity;
 		}
 	}
diff --git a/OpenRA.Mods.RA/Move/Mobile.cs b/OpenRA.Mods.RA/Move/Mobile.cs
index eaac8b181c..e5ee509b21 100755
--- a/OpenRA.Mods.RA/Move/Mobile.cs
+++ b/OpenRA.Mods.RA/Move/Mobile.cs
@@ -129,6 +129,7 @@ namespace OpenRA.Mods.RA.Move
 		{
 			SetLocation( cell, cell );
 			PxPosition = Util.CenterOfCell(fromCell);
+			FinishedMoving(self);
 		}
 
 		public void SetPxPosition( Actor self, int2 px )
@@ -136,6 +137,7 @@ namespace OpenRA.Mods.RA.Move
 			var cell = Util.CellContaining( px );
 			SetLocation( cell, cell );
 			PxPosition = px;
+			FinishedMoving(self);
 		}
 
 		public IEnumerable<IOrderTargeter> Orders { get { yield return new MoveOrderTargeter( Info ); } }