diff --git a/lib/upgrades/UpgradeFunctions.inc.php b/lib/upgrades/UpgradeFunctions.inc.php
index 248e3bd..7ad60ea 100644
--- a/lib/upgrades/UpgradeFunctions.inc.php
+++ b/lib/upgrades/UpgradeFunctions.inc.php
@@ -165,7 +165,7 @@ class UpgradeFunctions {
 		if (empty($parent_ids)) $parent_ids = null;
 		if (empty($full_path)) $full_path = null;
 
-		$full_path = (empty($full_path))?$name:($full_path . '/' . $name);
+		if($folderid != 1) $full_path = (empty($full_path))?$name:($full_path . '/' . $name);
 		$folder_ids [] = $folderid;
 
 		$sql = "update folders set name=?,description=?, full_path=?, parent_folder_ids=? where id=?";
@@ -189,7 +189,10 @@ class UpgradeFunctions {
     {
     	$GLOBALS["_OBJECTCACHE"] = array();
 
-		UpgradeFunctions::_removeSlashesFromFolders(1, '', array(), array());
+    	$sql = "select name from folders where id=1";
+		$name = DBUtil::getOneResultKey($sql,'name');
+
+		UpgradeFunctions::_removeSlashesFromFolders(1, $name, array(), array());
 		DBUtil::commit();
     }