diff --git a/common/buildcraft/robots/ai/AIRobotGotoBlock.java b/common/buildcraft/robots/ai/AIRobotGotoBlock.java
index cb043a35..67a5fdf7 100755
--- a/common/buildcraft/robots/ai/AIRobotGotoBlock.java
+++ b/common/buildcraft/robots/ai/AIRobotGotoBlock.java
@@ -41,6 +41,7 @@ public class AIRobotGotoBlock extends AIRobotGoto {
 		finalX = x;
 		finalY = y;
 		finalZ = z;
+		robot.aimItemAt((int) Math.floor(finalX), (int) Math.floor(finalY), (int) Math.floor(finalZ));
 	}
 
 	public AIRobotGotoBlock(EntityRobotBase robot, int x, int y, int z, double iMaxDistance) {
@@ -55,6 +56,7 @@ public class AIRobotGotoBlock extends AIRobotGoto {
 		finalX = path.getLast().x;
 		finalY = path.getLast().y;
 		finalZ = path.getLast().z;
+		robot.aimItemAt((int) Math.floor(finalX), (int) Math.floor(finalY), (int) Math.floor(finalZ));
 		setNextInPath();
 	}
 
diff --git a/common/buildcraft/robots/ai/AIRobotPumpBlock.java b/common/buildcraft/robots/ai/AIRobotPumpBlock.java
index 98d30685..7c541ac9 100644
--- a/common/buildcraft/robots/ai/AIRobotPumpBlock.java
+++ b/common/buildcraft/robots/ai/AIRobotPumpBlock.java
@@ -66,11 +66,6 @@ public class AIRobotPumpBlock extends AIRobot {
 
 	}
 
-	@Override
-	public void end() {
-		robot.aimItemAt(0, 1, 0);
-	}
-
 	@Override
 	public int getEnergyCost() {
 		return 20;
diff --git a/common/buildcraft/robots/ai/AIRobotStraightMoveTo.java b/common/buildcraft/robots/ai/AIRobotStraightMoveTo.java
index d08a2ca2..34e7c7d4 100755
--- a/common/buildcraft/robots/ai/AIRobotStraightMoveTo.java
+++ b/common/buildcraft/robots/ai/AIRobotStraightMoveTo.java
@@ -26,6 +26,7 @@ public class AIRobotStraightMoveTo extends AIRobotGoto {
 		x = ix;
 		y = iy;
 		z = iz;
+		robot.aimItemAt((int) Math.floor(x), (int) Math.floor(y), (int) Math.floor(z));
 	}
 
 	@Override