diff --git a/firewall/firewall-add b/firewall/firewall-add
index 74886dd..5c180fb 100755
--- a/firewall/firewall-add
+++ b/firewall/firewall-add
@@ -40,16 +40,6 @@ elif [[ "$(echo $SOURCE_IP | cut -d . -f4)" == "0" ]] ; then
 	debug "source ip is $SOURCE_IP"
 
 # Modifying source or target IP addresses if POSTROUTING rules needed to applied
-elif [[ ! -z "$POSTROUTING" ]]; then
-	if [[ ! -z "$SOURCE_IP" ]]; then
-	SOURCE_IP="$(echo $SOURCE_IP | cut -d . -f1-3).0/24";
-	debug "source ip is $SOURCE_IP"
-	fi
-	
-	if [[ ! -z "$TARGET_IP" ]]; then
-	TARGET_IP="$(echo $TARGET_IP | cut -d . -f1-3).0/24";
-	debug "target ip is $TARGET_IP"
-	fi
 fi;
 
 if [[ -z "$TARGET_IP" ]]; then
@@ -79,8 +69,19 @@ prerouting() {
 
 postrouting() {
 
+	
+	if [[ ! -z "$SOURCE_IP" ]]; then
+	SOURCE_IP_FOR_POSTROUTING="$(echo $SOURCE_IP | cut -d . -f1-3).0/24";
+	debug "source ip is $SOURCE_IP_FOR_POSTROUTING"
+	fi
+	
+	if [[ ! -z "$TARGET_IP" ]]; then
+	TARGET_IP_FOR_POSTROUTING="$(echo $TARGET_IP | cut -d . -f1-3).0/24";
+	debug "target ip is $TARGET_IP_FOR_POSTROUTING"
+	fi
+	
 	if  [ -n "$SOURCE_IP" ] ; then
-		LINES=$($IPTABLES -L --line-number -n | grep POSTROUTING | grep $COMMENT | grep $SOURCE_IP | grep $SOURCE_PORT | awk '{print $1}'| tac)
+		LINES=$($IPTABLES -L --line-number -n | grep POSTROUTING | grep $COMMENT | grep $SOURCE_IP_FOR_POSTROUTING | grep $SOURCE_PORT | awk '{print $1}'| tac)
 		debug "Previous postrouting lines: "$LINES
 
 		# DELETE UNECESSARY LINES FROM PREVIOUS RULES
@@ -92,12 +93,13 @@ postrouting() {
 			done
 		fi
 	
-	debug "$IPTABLES -I POSTROUTING -s $SOURCE_IP -p $PROTOCOL --dport $SOURCE_PORT -m comment --comment "$COMMENT" -j MASQUERADE"	
-	$IPTABLES -I POSTROUTING -d $SOURCE_IP -p $PROTOCOL --dport $SOURCE_PORT -m comment --comment "$COMMENT" -j MASQUERADE	
+	debug "$IPTABLES -I POSTROUTING -s $SOURCE_IP_FOR_POSTROUTING -p $PROTOCOL --dport $SOURCE_PORT -m comment --comment "$COMMENT" -j MASQUERADE"	
+	$IPTABLES -I POSTROUTING -d $SOURCE_IP_FOR_POSTROUTING -p $PROTOCOL --dport $SOURCE_PORT -m comment --comment "$COMMENT" -j MASQUERADE	
+
 	fi 
 
 	if  [ -n "$TARGET_IP" ] ; then
-		LINES=$($IPTABLES -L --line-number -n | grep $COMMENT | grep $TARGET_IP | grep $TARGET_PORT | awk '{print $1}'| tac)
+		LINES=$($IPTABLES -L --line-number -n | grep $COMMENT | grep $TARGET_IP_FOR_POSTROUTING | grep $TARGET_PORT | awk '{print $1}'| tac)
 		debug "Previous postrouting lines: "$LINES
 
 		# DELETE UNECESSARY LINES FROM PREVIOUS RULES
@@ -108,8 +110,8 @@ postrouting() {
 				sleep 0.1
 			done
 		fi
-	debug "$IPTABLES -I POSTROUTING -s $TARGET_IP -p $PROTOCOL --dport $TARGET_PORT -m comment --comment "$COMMENT" -j MASQUERADE"	
-	$IPTABLES -I POSTROUTING -d $TARGET_IP -p $PROTOCOL --dport $TARGET_PORT -m comment --comment "$COMMENT" -j MASQUERADE	
+	debug "$IPTABLES -I POSTROUTING -s $TARGET_IP_FOR_POSTROUTING -p $PROTOCOL --dport $TARGET_PORT -m comment --comment "$COMMENT" -j MASQUERADE"	
+	$IPTABLES -I POSTROUTING -d $TARGET_IP_FOR_POSTROUTING -p $PROTOCOL --dport $TARGET_PORT -m comment --comment "$COMMENT" -j MASQUERADE	
 	fi
 }