diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index b605829b77..e9dda89d1e 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-29  Ramon Novoa  <rnovoa@artica.es>
+
+	* include/fgraph.php: Do not propagate compressed data to dates in the
+	  future to make the baseline clearer.
+
 2010-10-29  Miguel de Dios  <miguel.dedios@artica.es>
 	
 	* extensions/dbmanager.php, godmode/agentes/module_manager_editor.php,
diff --git a/pandora_console/include/fgraph.php b/pandora_console/include/fgraph.php
index 089a613d99..6d07f31534 100644
--- a/pandora_console/include/fgraph.php
+++ b/pandora_console/include/fgraph.php
@@ -1467,7 +1467,7 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 			$previous_data = $total;
 		// Compressed data
 		} else {
-			if ($uncompressed_module) {
+			if ($uncompressed_module || ($timestamp > time ())) {
 				$chart[$timestamp]['sum'] = 0;
 				$chart[$timestamp]['min'] = 0;
 				$chart[$timestamp]['max'] = 0;
@@ -1485,7 +1485,7 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
 		$chart[$timestamp]['alert'] = $alert_value;
 		$chart[$timestamp]['baseline'] = array_shift ($baseline_data);
 		if ($chart[$timestamp]['baseline'] == NULL) {
-			$baseline = 0;
+			$chart[$timestamp]['baseline'] = 0;
 		}
 	}