diff --git a/firewall/firewall-add b/firewall/firewall-add
index 5fb754c..3e45dc9 100755
--- a/firewall/firewall-add
+++ b/firewall/firewall-add
@@ -16,8 +16,8 @@ POSTROUTING=$POSTROUTING
 # Mandatory task variables
 CHAIN=$CHAIN
 NAME=$NAME
-COMMENT="-$COMMENT"
-NAME=$NAME$COMMENT
+COMMENT="$COMMENT"
+NAME="$NAME-$COMMENT"
 PROTOCOL=$TYPE
 
 EXTRA_OPTIONS="$2 $3 $4"