diff --git a/inc/inc.ClassFolder.php b/inc/inc.ClassFolder.php
index 69ff97313..9d7d2701a 100644
--- a/inc/inc.ClassFolder.php
+++ b/inc/inc.ClassFolder.php
@@ -401,7 +401,8 @@ class LetoDMS_Folder
 			
 			$this->_subFolders = array();
 			for ($i = 0; $i < count($resArr); $i++)
-				$this->_subFolders[$i] = new LetoDMS_Folder($resArr[$i]["id"], $resArr[$i]["name"], $resArr[$i]["parent"], $resArr[$i]["comment"], $resArr[$i]["owner"], $resArr[$i]["inheritAccess"], $resArr[$i]["defaultAccess"], $resArr[$i]["sequence"]);
+//				$this->_subFolders[$i] = new LetoDMS_Folder($resArr[$i]["id"], $resArr[$i]["name"], $resArr[$i]["parent"], $resArr[$i]["comment"], $resArr[$i]["owner"], $resArr[$i]["inheritAccess"], $resArr[$i]["defaultAccess"], $resArr[$i]["sequence"]);
+				$this->_subFolders[$i] = $this->_dms->getFolder($resArr[$i]["id"]);
 		}
 		
 		return $this->_subFolders;
@@ -523,7 +524,8 @@ class LetoDMS_Folder
 			
 			$this->_documents = array();
 			foreach ($resArr as $row) {
-				array_push($this->_documents, new LetoDMS_Document($row["id"], $row["name"], $row["comment"], $row["date"], $row["expires"], $row["owner"], $row["folder"], $row["inheritAccess"], $row["defaultAccess"], isset($row["lockUser"])?$row["lockUser"]:NULL, $row["keywords"], $row["sequence"]));
+//				array_push($this->_documents, new LetoDMS_Document($row["id"], $row["name"], $row["comment"], $row["date"], $row["expires"], $row["owner"], $row["folder"], $row["inheritAccess"], $row["defaultAccess"], isset($row["lockUser"])?$row["lockUser"]:NULL, $row["keywords"], $row["sequence"]));
+				array_push($this->_documents, $this->_dms->getDocument($row["id"]));
 			}
 		}
 		return $this->_documents;
diff --git a/out/out.Statistic.php b/out/out.Statistic.php
index 945c5b118..fb4c5b17e 100644
--- a/out/out.Statistic.php
+++ b/out/out.Statistic.php
@@ -210,7 +210,7 @@ print "</ul>\n";
 print "</td><td>\n";
 
 print "<ul>\n";
-printFolder(getFolder($settings->_rootFolderID));
+printFolder($dms->getFolder($settings->_rootFolderID));
 print "</ul>\n";
 
 print "</td></tr>";