diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 3301dddd79..28a0edda56 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-30 Koichiro Kikuchi <koichiro@rworks.jp>
+
+	* include/functions_api.php: Fixed join parameter to avoid
+	  generating unusable module lines.
+
 2011-08-30 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
 
 	* godmode/users/configure_user.php: Now action state is showed
diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index e93e2eb3d6..eaaae39142 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -310,7 +310,7 @@ function get_tree_agents($trash1, $trahs2, $other, $returnType)
 						INNER JOIN (SELECT *
 							FROM tagente_estado
 							WHERE id_agente = ' . $agent['id_agente'] . ') AS t2
-						ON t1.id_agente = t2.id_agente');
+						ON t1.id_agente_modulo = t2.id_agente_modulo');
 				
 				if ($modules === false) $modules = array();
 				$modules = str_replace('\n', $returnReplace, $modules);
@@ -1583,4 +1583,4 @@ function set_new_note_incident($id, $id2, $other, $thrash2) {
 	else
 		returnData('string', array('type' => 'string', 'data' => $idNote));
 }
-?>
\ No newline at end of file
+?>