diff --git a/src/kademlia/node/Node.java b/src/kademlia/node/Node.java
index f6cc88f..6dd7e16 100644
--- a/src/kademlia/node/Node.java
+++ b/src/kademlia/node/Node.java
@@ -26,17 +26,13 @@ public class Node implements Streamable
 
     private transient RoutingTable routingTable;
 
-    
-    {
-        this.routingTable = new RoutingTable(this);
-    }
-
     public Node(NodeId nid, InetAddress ip, int port)
     {
         this.nodeId = nid;
         this.inetAddress = ip;
         this.port = port;
         this.strRep = this.nodeId.toString();
+        this.routingTable = new RoutingTable(this);
     }
 
     /**
diff --git a/src/kademlia/routing/RoutingTable.java b/src/kademlia/routing/RoutingTable.java
index 1c410a2..1d99287 100644
--- a/src/kademlia/routing/RoutingTable.java
+++ b/src/kademlia/routing/RoutingTable.java
@@ -32,8 +32,8 @@ public class RoutingTable
         /* Initialize all of the buckets to a specific depth */
         this.initialize();
 
-        /* @todo Insert the local node */
-        //this.insert(localNode);
+        /* Insert the local node */
+        this.insert(localNode);
     }
 
     /**