diff --git a/modules/document/document.item.php b/modules/document/document.item.php
index 174c5fa5c..379931909 100644
--- a/modules/document/document.item.php
+++ b/modules/document/document.item.php
@@ -139,13 +139,12 @@ class documentItem extends Object
 		}
 
 		$oDocumentModel = getModel('document');
-		$GLOBALS['XE_DOCUMENT_LIST'][$this->document_srl] = $this;
 		if($load_extra_vars)
 		{
-			$oDocumentModel->getDocumentExtraVarsFromDB($this->document_srl);
-			$this->add('title', $this->get('title'));
-			$this->add('content', $this->get('content'));
+			$GLOBALS['XE_DOCUMENT_LIST'][$attribute->document_srl] = $this;
+			$oDocumentModel->setToAllDocumentExtraVars();
 		}
+		$GLOBALS['XE_DOCUMENT_LIST'][$this->document_srl] = $this;
 	}
 
 	function isExists()