diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 917fb8975f..f7b87e62fc 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-18  Ramon Novoa  <rnovoa@artica.es>
+
+	* lib/PandoraFMS/Core.pm: Copy tag names to events, not the URL.
+
 2014-08-18  Alejandro Gallardo <alejandro.gallardo@artica.es>
 
 	* lib/PandoraFMS/Core.pm: Added an internal action to
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 174cfa8587..3cc567b35b 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -2761,7 +2761,7 @@ sub pandora_event ($$$$$$$$$$;$$$$$$$$$) {
 	}
 	else {
 		if (defined ($id_agentmodule) && $id_agentmodule > 0) {
-			$module_tags = pandora_get_module_url_tags ($pa_config, $dbh, $id_agentmodule);
+			$module_tags = pandora_get_module_tags ($pa_config, $dbh, $id_agentmodule);
 		}
 	}