diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index d236ba3471..95aae881f5 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-26 Dario Rodriguez <dario.rodriguez@artica.es>
+
+	* include/functions_graph.php: Fixed a problem with graphs which
+	shows only a few points instead of all of them.
+
 2011-09-26 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
 
 	* install.php: Fixed height style attribute in step 3. 
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 7546b95cbe..d8c77ba80b 100755
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -189,25 +189,25 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 		}
 		
 		// Set the title and time format
-		if ($period <= 3600) {
+		if ($period <= 21600) {
 			$title_period = __('Last hour');
-			$time_format = 'G:i:s';
+			$time_format = 'H:i:s';
 		}
-		elseif ($period <= 86400) {
+		elseif ($period < 86400) {
 			$title_period = __('Last day');
-			$time_format = 'G:i';
+			$time_format = 'H:i';
 		}
-		elseif ($period <= 604800) {
+		elseif ($period < 1296000) {
 			$title_period = __('Last week');
-			$time_format = 'M j';
+			$time_format = 'M d H:i';
 		}
-		elseif ($period <= 2419200) {
+		elseif ($period < 2592000) {
 			$title_period = __('Last month');
-			$time_format = 'M j';
+			$time_format = 'M d H\h';
 		} 
 		else {
 			$title_period = __('Last %s days', format_numeric (($period / (3600 * 24)), 2));
-			$time_format = 'M j';
+			$time_format = 'M d H\h';
 		}
 
 		$timestamp_short = date($time_format, $timestamp);