diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 7361eb0fdf..4aa0b11f20 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-21  Ramon Novoa  <rnovoa@artica.es>
+
+	* lib/PandoraFMS/Core.pm: Fixed max_min alerts.
+
 2009-10-21  Sancho Lerena <slerena@artica.es>
 
 	First bug detected & fixed after RC1, whoah :/
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 6bb1c3d22b..3511b0111c 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -156,8 +156,8 @@ sub pandora_evaluate_alert ($$$$$$) {
 		return $status if ($alert->{'type'} eq "max" && $data <= $alert->{'max_value'});
 
 		if ($alert->{'type'} eq "max_min") {
-			if ($alert->{'matches_value'} != 1) {
-				return $status if ($data <= $alert->{'min_value'} &&
+			if ($alert->{'matches_value'} == 1) {
+				return $status if ($data <= $alert->{'min_value'} ||
 				                  $data >= $alert->{'max_value'});
 			} else {
 				return $status if ($data >= $alert->{'min_value'} &&