diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index fb293568b29..30cee51ef46 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -251,14 +251,11 @@ print "</tr>\n";
 
 clearstatcache();
 
-// Check if there is external models to do asked by plugins
-if (is_array($conf->models_modules) && ! empty($conf->models_modules)) {
-	$conf->file->dol_document_root = array_merge($conf->file->dol_document_root,$conf->models_modules);
-}
+$dirmodels=array_merge(array('/'),$conf->models_modules);
 
-foreach ($conf->file->dol_document_root as $dirroot)
+foreach ($dirmodels as $reldir)
 {
-	$dir = $dirroot . "/core/modules/commande/";
+	$dir = dol_buildpath($reldir."core/modules/commande/");
 
 	if (is_dir($dir))
 	{
@@ -387,17 +384,14 @@ print "</tr>\n";
 
 clearstatcache();
 
-// Check if there is external models to do asked by plugins
-if (is_array($conf->models_modules) && ! empty($conf->models_modules)) {
-	$conf->file->dol_document_root = array_merge($conf->file->dol_document_root,$conf->models_modules);
-}
+$dirmodels=array_merge(array('/'),$conf->models_modules);
 
 $var=true;
-foreach ($conf->file->dol_document_root as $dirroot)
+foreach ($dirmodels as $reldir)
 {
     foreach (array('','/doc') as $valdir)
     {
-        $dir = $dirroot . "/core/modules/commande".$valdir;
+    	$dir = dol_buildpath($reldir."core/modules/commande".$valdir);
 
         if (is_dir($dir))
         {
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 52ce7236c45..1226b3f5d03 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -318,21 +318,19 @@ print '</tr>'."\n";
 
 clearstatcache();
 
-// Check if there is external models to do asked by plugins
-if (is_array($conf->models_modules) && ! empty($conf->models_modules)) {
-	$conf->file->dol_document_root = array_merge($conf->file->dol_document_root,$conf->models_modules);
-}
+$dirmodels=array_merge(array('/'),$conf->models_modules);
 
-$var=true;
-foreach ($conf->file->dol_document_root as $dirroot)
+foreach ($dirmodels as $reldir)
 {
-    $dir = $dirroot . "/core/modules/facture/";
+	$dir = dol_buildpath($reldir."core/modules/commande/");
 
     if (is_dir($dir))
     {
         $handle = opendir($dir);
         if (is_resource($handle))
         {
+        	$var=true;
+        	
             while (($file = readdir($handle))!==false)
             {
                 if (! is_dir($dir.$file) || (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS'))
@@ -488,17 +486,14 @@ print "</tr>\n";
 
 clearstatcache();
 
-// Check if there is external models to do asked by plugins
-if (is_array($conf->models_modules) && ! empty($conf->models_modules)) {
-	$conf->file->dol_document_root = array_merge($conf->file->dol_document_root,$conf->models_modules);
-}
+$dirmodels=array_merge(array('/'),$conf->models_modules);
 
 $var=true;
-foreach ($conf->file->dol_document_root as $dirroot)
+foreach ($dirmodels as $reldir)
 {
     foreach (array('','/doc') as $valdir)
     {
-        $dir = $dirroot . "/core/modules/facture".$valdir;
+    	$dir = dol_buildpath($reldir."core/modules/facture".$valdir);
 
         if (is_dir($dir))
         {
diff --git a/htdocs/admin/propale.php b/htdocs/admin/propale.php
index 8ae0e25777b..ab2c081f9b4 100644
--- a/htdocs/admin/propale.php
+++ b/htdocs/admin/propale.php
@@ -74,7 +74,7 @@ if ($action == 'specimen')
 	$dirmodels=array_merge(array('/'),$conf->models_modules);
 	foreach($dirmodels as $reldir)
 	{
-	    $file=dol_buildpath($reldir."core/modules/propale/doc/pdf_".$modele.".modules.php",0);
+	    $file=dol_buildpath($reldir."core/modules/propale/doc/pdf_".$modele.".modules.php");
 		if (file_exists($file))
 		{
 			$filefound=1;
@@ -283,14 +283,11 @@ print '</tr>'."\n";
 
 clearstatcache();
 
-// Check if there is external models to do asked by plugins
-if (is_array($conf->models_modules) && ! empty($conf->models_modules)) {
-	$conf->file->dol_document_root = array_merge($conf->file->dol_document_root,$conf->models_modules);
-}
+$dirmodels=array_merge(array('/'),$conf->models_modules);
 
-foreach ($conf->file->dol_document_root as $dirroot)
+foreach ($dirmodels as $reldir)
 {
-	$dir = $dirroot . "/core/modules/propale/";
+	$dir = dol_buildpath($reldir."core/modules/propale/");
 
 	if (is_dir($dir))
 	{
@@ -419,17 +416,14 @@ print "</tr>\n";
 
 clearstatcache();
 
-// Check if there is external models to do asked by plugins
-if (is_array($conf->models_modules) && ! empty($conf->models_modules)) {
-	$conf->file->dol_document_root = array_merge($conf->file->dol_document_root,$conf->models_modules);
-}
+$dirmodels=array_merge(array('/'),$conf->models_modules);
 
 $var=true;
-foreach ($conf->file->dol_document_root as $dirroot)
+foreach ($dirmodels as $reldir)
 {
     foreach (array('','/doc') as $valdir)
     {
-        $dir = $dirroot . "/core/modules/propale".$valdir;
+    	$dir = dol_buildpath($reldir."core/modules/propale".$valdir);
 
         if (is_dir($dir))
         {
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index f8e698e09fb..f0745528341 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -164,7 +164,7 @@ class Conf
 							if (! is_array($this->$varname)) { $this->$varname = array(); }
 							$arrValue = @unserialize($value);
 							if (is_array($arrValue) && ! empty($arrValue)) $value = $arrValue;
-							else if ($partname == 'models' && $value == 1) $value = dol_buildpath('/'.$modulename);
+							else if ($partname == 'models' && $value == 1) $value = '/'.$modulename.'/';
 							else $value = ($value == 1 ? '/'.$modulename.'/core/'.$partname.'/' : $value);
 							$this->$varname = array_merge($this->$varname, array($modulename => $value));
 						}