diff --git a/pandora_console/include/class/Tree.class.php b/pandora_console/include/class/Tree.class.php
index 71710fe035..cd72a3b2c5 100644
--- a/pandora_console/include/class/Tree.class.php
+++ b/pandora_console/include/class/Tree.class.php
@@ -707,7 +707,7 @@ class Tree {
 						AND tam.disabled = 0
 						$agent_search
 						$group_acl
-					ORDER BY tam.nombre ASC, ta.nombre ASC";
+					ORDER BY tam.id_module_group ASC, tam.nombre ASC, ta.nombre ASC";
 			$data = db_process_sql($sql);
 		}
 
@@ -786,7 +786,7 @@ class Tree {
 
 				// Create new module group
 				$actual_module_group_root = array();
-				$actual_module_group_root['id'] = (int) $module['id_module_group'];
+				$actual_module_group_root['id'] = $module['id_module_group'];
 				$actual_module_group_root['type'] = $this->type;
 
 				if (isset($module_groups[$module['id_module_group']])) {