diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 474df249ae..9fe5d86267 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2012-03-13 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
+
+	* include/functions_graph.php: Removed legend in 
+	graphic_module_events function due to attachment overload.
+	* include/functions_agents.php: Non-init count was bad because 
+	normal modules are counted too.
+
 2012-03-12 Miguel de Dios <miguel.dedios@artica.es>
 
 	* include/functions_visual_map.php: refixed again, removed the old method
diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php
index d77c65abfb..d793eb438b 100644
--- a/pandora_console/include/functions_agents.php
+++ b/pandora_console/include/functions_agents.php
@@ -400,7 +400,7 @@ function agents_get_agents ($filter = false, $fields = false, $access = 'AR', $o
 			// Not init
 			case 5:	
 				$status_sql = "id_agente NOT IN ($warning_modules) &&
-				 id_agente NOT IN ($critical_modules) && id_agente NOT IN ($unknown_modules)";
+				 id_agente NOT IN ($critical_modules) && id_agente NOT IN ($unknown_modules) && id_agente NOT IN ($normal_modules)";
 				break;
 
 		}
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 4ae7de1f5e..80fd1496d5 100755
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -2892,35 +2892,7 @@ function graphic_module_events ($id_module, $width, $height, $period = 0, $homeu
 	}
 	else {
 		echo slicesbar_graph($data, $period, $width, 15, $colors, $config['fontpath'], $config['round_corner'], $homeurl);
-
-		// Draw legend
-		echo "<br>";
-	
-		if(!$config['flash_charts']) {
-			// Draw legend
-			echo "<br>";
-		
-			//echo "<div id='legend' style='overflow:hidden;'";
-			$count = 0;
-			foreach ($legend as $name => $value) {
-				$file_name = string2image(ui_print_truncate_text($value, 15, false, true, false, '...'), 115, 13, 2, 270, '#FFFFFF', '#696969', 4, 0);
-				
-				if (($step >= 1) && ($count++ % $step == 0)) {
-					if ($zoom == 1)
-						echo "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
-					elseif ($zoom == 2)
-						echo "&nbsp;&nbsp;";
-					elseif ($zoom == 3)
-							echo "&nbsp;&nbsp;";
-					elseif ($zoom == 4)
-						echo "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";	
-						
-					echo html_print_image($file_name, true, array('title' => $value));
-				}
-			}
-		}
 	}
-	//echo "</div>";	
 }
 
 ?>