diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 9475c0d9a8..b1be1c2a04 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-06  Sergio Martin <sergio.martin@artica.es>
+
+	* lib/PandoraFMS/Core.pm: Change the update count of fired alerts 
+	condition to increase the count only when a alert is fired first time
+	to avoid broke counts
+
 2013-03-05  Ramon Novoa  <rnovoa@artica.es>
 
 	* lib/PandoraFMS/SNMPServer.pm: Added an option to start the snmptrapd
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 97a09e0cd4..d269bb253f 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -564,8 +564,8 @@ sub pandora_process_alert ($$$$$$$$;$) {
 				last_fired = ?, internal_counter = ? ' . $new_interval . ' WHERE id = ?',
 			$alert->{'times_fired'}, $utimestamp, $alert->{'internal_counter'}, $id);
 		
-		# Update fired alert count
-		if (defined ($agent)) {
+		# Update fired alert count only in first fired time
+		if (defined ($agent) && $alert->{'times_fired'} == 1) {
 			db_do ($dbh, 'UPDATE tagente SET fired_count=fired_count+1 WHERE id_agente=?', $agent->{'id_agente'});
 		}
 		
@@ -633,6 +633,7 @@ sub pandora_execute_alert ($$$$$$$$;$) {
 					AND ((fires_min = 0 AND fires_max = 0)
 					OR (? >= fires_min AND ? <= fires_max))', 
 					$alert->{'id'}, $alert->{'times_fired'}, $alert->{'times_fired'});
+					
 		# Get default action
 		if ($#actions < 0) {
 			@actions = get_db_rows ($dbh, 'SELECT * FROM talert_actions, talert_commands