diff --git a/Code/IO/otbSHPVectorDataIO.txx b/Code/IO/otbSHPVectorDataIO.txx
index 41e6c5ddc08acd9fa850f13796a9a8509a6a3cd2..e88b2f69e73cb712ba8ccf607f0ac5f4c3a335df 100644
--- a/Code/IO/otbSHPVectorDataIO.txx
+++ b/Code/IO/otbSHPVectorDataIO.txx
@@ -184,9 +184,9 @@ SHPVectorDataIO<TData>
       chrono.Start();
 
       // Creating a new folder
-      DataNodePointerType folder = DataNodeType::New();
-      folder->SetNodeType(FOLDER);
-      folder->SetNodeId(feature->GetDefnRef()->GetName());
+//       DataNodePointerType folder = DataNodeType::New();
+//       folder->SetNodeType(FOLDER);
+//       folder->SetNodeId(feature->GetDefnRef()->GetName());
 
       // Reading fields
 //       for (int fieldIndex = 0; fieldIndex<dfn->GetFieldCount();++fieldIndex)
@@ -198,9 +198,10 @@ SHPVectorDataIO<TData>
 
 
       // Add the folder to the document
-      typename InternalTreeNodeType::Pointer folderPtr = InternalTreeNodeType::New();
-      folderPtr->Set(folder);
-      documentPtr->AddChild(folderPtr);
+//       typename InternalTreeNodeType::Pointer folderPtr = InternalTreeNodeType::New();
+//       folderPtr->Set(folder);
+//       documentPtr->AddChild(folderPtr);
+      typename InternalTreeNodeType::Pointer folderPtr = documentPtr;//TODO: clean references to folder and replace by documentPtr
 
       // A pointer to the current multi-geometry
       typename InternalTreeNodeType::Pointer multiPtr;