diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index e8607c588d..583ebc4c38 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-04  Koichiro Kikuchi  <koichiro@rworks.jp>
+
+	* lib/PandoraFMS/Core.pm: Added missing safe_output to decode
+	  str_critical/str_warning.
+
 2011-10-28  Dario Rodriguez  <dario.rodriguez@artica.es>
 
 	* util/recon_scripts/snmpdevices.pl: Fixed a bug related to main loop
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index bbc142f5f3..c6bd7fba41 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -1904,7 +1904,7 @@ sub get_module_status ($$$) {
 	my ($data, $module, $module_type) = @_;
 	my ($critical_min, $critical_max, $warning_min, $warning_max) =
 		($module->{'min_critical'}, $module->{'max_critical'}, $module->{'min_warning'}, $module->{'max_warning'});
-	my ($critical_str, $warning_str) = ($module->{'str_critical'}, $module->{'str_warning'});
+	my ($critical_str, $warning_str) = map { safe_output($_) } ($module->{'str_critical'}, $module->{'str_warning'});
 	
 	# Was the module status set in the XML data file?
 	if (defined ($module->{'status'})) {