diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 7f46d82339..7ae5eac7df 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-16  Ramon Novoa  <rnovoa@artica.es>
+
+	* lib/PandoraFMS/DataServer.pm: When reading module tags use
+	  get_tag_value to avoid trouble with empty tags.
+
 2011-08-13  Sancho Lerena <slerena@artica.es>
 
     * lib/Core.pm: get_agent_from_addr() function is now in Core because
diff --git a/pandora_server/lib/PandoraFMS/DataServer.pm b/pandora_server/lib/PandoraFMS/DataServer.pm
index 46505d436b..b85d2a827d 100644
--- a/pandora_server/lib/PandoraFMS/DataServer.pm
+++ b/pandora_server/lib/PandoraFMS/DataServer.pm
@@ -458,9 +458,9 @@ sub process_module_data ($$$$$$$$$) {
 	# Read tags
 	while (my ($tag, $value) = each (%{$data})) {
 		if (defined ($tags->{$tag})) {
-			$module_conf->{$tag} = $value->[0];
+			$module_conf->{$tag} = get_tag_value ($data, $tag, '');
 		} else {
-			$module_conf->{'extended_info'} .= "$tag: " . $value->[0] . '<br/>';
+			$module_conf->{'extended_info'} .= "$tag: " . get_tag_value ($data, $tag, '') . '<br/>';
 		}
 	}