diff --git a/apps/calendar/appinfo/remote.php b/apps/calendar/appinfo/remote.php
index 93d57b2e40ca12b52a68e196729750a0f69f3c7e..d500ec1080aa08dc3162c4565c6ce6cec36a55d0 100644
--- a/apps/calendar/appinfo/remote.php
+++ b/apps/calendar/appinfo/remote.php
@@ -21,12 +21,15 @@ $principalBackend = new OC_Connector_Sabre_Principal();
 $caldavBackend    = new OC_Connector_Sabre_CalDAV();
 
 // Root nodes
-$collection = new Sabre_CalDAV_Principal_Collection($principalBackend); 
-$collection->disableListing = true; // Disable listening
+$Sabre_CalDAV_Principal_Collection = new Sabre_CalDAV_Principal_Collection($principalBackend); 
+$Sabre_CalDAV_Principal_Collection->disableListing = true; // Disable listening
+
+$Sabre_CalDAV_CalendarRootNode = new Sabre_CalDAV_CalendarRootNode($principalBackend, $caldavBackend); 
+$Sabre_CalDAV_CalendarRootNode->disableListing = true; // Disable listening
 
 $nodes = array( 
-	$collection, 
-	new Sabre_CalDAV_CalendarRootNode($principalBackend, $caldavBackend),
+	$Sabre_CalDAV_Principal_Collection, 
+	$Sabre_CalDAV_CalendarRootNode,
 	);
 
 
diff --git a/apps/contacts/appinfo/remote.php b/apps/contacts/appinfo/remote.php
index 2a6a3bea2e1ba2bffafb49d51d4f77b0e6062c83..2810358e7f2a0b02dc3415b230c3f303c2e6a0bd 100644
--- a/apps/contacts/appinfo/remote.php
+++ b/apps/contacts/appinfo/remote.php
@@ -36,12 +36,15 @@ $principalBackend = new OC_Connector_Sabre_Principal();
 $carddavBackend   = new OC_Connector_Sabre_CardDAV();
 
 // Root nodes
-$collection = new Sabre_CalDAV_Principal_Collection($principalBackend); 
-$collection->disableListing = true; // Disable listening
+$Sabre_CalDAV_Principal_Collection = new Sabre_CalDAV_Principal_Collection($principalBackend); 
+$Sabre_CalDAV_Principal_Collection->disableListing = true; // Disable listening
+
+$Sabre_CardDAV_AddressBookRoot = new Sabre_CardDAV_AddressBookRoot($principalBackend, $carddavBackend);
+$Sabre_CardDAV_AddressBookRoot->disableListing = true; // Disable listening
 
 $nodes = array( 
-	$collection, 
-	new Sabre_CardDAV_AddressBookRoot($principalBackend, $carddavBackend),
+	$Sabre_CalDAV_Principal_Collection, 
+	$Sabre_CardDAV_AddressBookRoot,
 	);
 
 // Fire up server