diff --git a/model/ccnx-l3-protocol.cc b/model/ccnx-l3-protocol.cc
index 83ab9d2..013a2ee 100644
--- a/model/ccnx-l3-protocol.cc
+++ b/model/ccnx-l3-protocol.cc
@@ -98,7 +98,6 @@
   NS_LOG_FUNCTION (this);
   
   m_pit = CreateObject<CcnxPit> ();
-  m_contentStore = CreateObject<CcnxContentStore> ();
 }
 
 CcnxL3Protocol::~CcnxL3Protocol ()
@@ -125,7 +124,7 @@
 {
   if (m_node == 0)
     {
-      Ptr<Node>node = this->GetObject<Node>();
+      Ptr<Node> node = this->GetObject<Node>();
       // verify that it's a valid node and that
       // the node has not been set before
       if (node != 0)
@@ -133,6 +132,11 @@
           this->SetNode (node);
         }
     }
+  if (m_contentStore == 0)
+    {
+      m_contentStore = this->GetObject<CcnxContentStore> ();
+    }
+
   Object::NotifyNewAggregate ();
 }