diff --git a/pandora_agents/unix/pandora_revent b/pandora_agents/unix/pandora_revent
index 0cba15a4eb..5f1bc8c3bd 100755
--- a/pandora_agents/unix/pandora_revent
+++ b/pandora_agents/unix/pandora_revent
@@ -198,7 +198,8 @@ sub tool_api_main () {
 				$id_group = $ARGV[$i + 1];
 			}
 			if ($line eq '-name') {
-				$event_name = join('%23', split("#", $ARGV[$i + 1]));
+				$event_name = $ARGV[$i + 1];
+				$event_name =~ s/#/%23/g;
 			}
 			if ($line eq '-type') {
 				$event_type = $ARGV[$i + 1];
diff --git a/pandora_server/util/pandora_revent.pl b/pandora_server/util/pandora_revent.pl
index 0cba15a4eb..5f1bc8c3bd 100755
--- a/pandora_server/util/pandora_revent.pl
+++ b/pandora_server/util/pandora_revent.pl
@@ -198,7 +198,8 @@ sub tool_api_main () {
 				$id_group = $ARGV[$i + 1];
 			}
 			if ($line eq '-name') {
-				$event_name = join('%23', split("#", $ARGV[$i + 1]));
+				$event_name = $ARGV[$i + 1];
+				$event_name =~ s/#/%23/g;
 			}
 			if ($line eq '-type') {
 				$event_type = $ARGV[$i + 1];