diff --git a/src/resonantinduction/contractor/BlockEMContractor.java b/src/resonantinduction/contractor/BlockEMContractor.java
index e7e85694e..0c6bf2df1 100644
--- a/src/resonantinduction/contractor/BlockEMContractor.java
+++ b/src/resonantinduction/contractor/BlockEMContractor.java
@@ -47,6 +47,8 @@ public class BlockEMContractor extends BlockBase implements ITileEntityProvider
 					if (linkVec.getTileEntity(world) instanceof TileEntityEMContractor)
 					{
 						contractor.setLink((TileEntityEMContractor) linkVec.getTileEntity(world));
+						entityPlayer.addChatMessage("Linked " + this.getLocalizedName() + " with " + " [" + (int) linkVec.x + ", " + (int) linkVec.y + ", " + (int) linkVec.z + "]");
+						return true;
 					}
 				}
 
diff --git a/src/resonantinduction/contractor/Pathfinder.java b/src/resonantinduction/contractor/Pathfinder.java
index c1d99f96f..cba416687 100644
--- a/src/resonantinduction/contractor/Pathfinder.java
+++ b/src/resonantinduction/contractor/Pathfinder.java
@@ -114,7 +114,7 @@ public class Pathfinder
 
 		if (naviMap.containsKey(currentNode))
 		{
-			path.addAll(this.reconstructPath(naviMap, currentNode));
+			path.addAll(this.reconstructPath(naviMap, naviMap.get(currentNode)));
 		}
 
 		return path;