diff --git a/firewall/firewall-add b/firewall/firewall-add
index 6ee9844..13f621d 100755
--- a/firewall/firewall-add
+++ b/firewall/firewall-add
@@ -60,7 +60,7 @@ IPTABLES=/sbin/iptables-legacy
 ###############################
 
 prerouting() {
-	LINES=$($IPTABLES -L --line-number -n | grep $COMMENT | grep DNAT |awk '{print $1}'| tac)
+	LINES=$($IPTABLES -L --line-number -n | grep $COMMENT | grep $SOURCE_IP | grep $SOURCE_PORT |grep $TARGET_IP |grep $TARGET_PORT | grep awk '{print $1}'| tac)
 	debug "Previous prerouting lines: "$LINES
 	# DELETE UNECESSARY LINES FROM PREVIOUS RULES
 	if [ -n "$LINES" ] ; then
@@ -76,7 +76,7 @@ prerouting() {
 }
 
 postrouting() {
-	LINES=$($IPTABLES -L --line-number -n | grep $COMMENT | grep MASQUERADE | awk '{print $1}'| tac)
+	LINES=$($IPTABLES -L --line-number -n | grep $COMMENT | grep $TARGET_IP | grep MASQUERADE | awk '{print $1}'| tac)
 	debug "Previous postrouting lines: "$LINES
 
 	# DELETE UNECESSARY LINES FROM PREVIOUS RULES