diff --git a/Shorewall-perl/Shorewall/Rules.pm b/Shorewall-perl/Shorewall/Rules.pm
index af39e4677..dbc01623d 100644
--- a/Shorewall-perl/Shorewall/Rules.pm
+++ b/Shorewall-perl/Shorewall/Rules.pm
@@ -891,8 +891,6 @@ sub process_macro ( $$$$$$$$$$$$$ ) {
 	    $msource = '';
 	}
 
-	$msource = '' if $msource eq '-';
-
 	if ( $mdest ) {
 	    if ( ( $mdest eq '-' ) || ( $mdest eq 'DEST' ) ) {
 		$mdest = $dest || '';
@@ -905,8 +903,6 @@ sub process_macro ( $$$$$$$$$$$$$ ) {
 	    $mdest = '';
 	}
 
-	$mdest   = '' if $mdest   eq '-';
-
 	$mproto  = merge_macro_column $mproto,  $proto;
 	$mports  = merge_macro_column $mports,  $ports;
 	$msports = merge_macro_column $msports, $sports;
@@ -1000,7 +996,7 @@ sub process_rule1 ( $$$$$$$$$$$ ) {
     #
     if ( $actiontype & REDIRECT ) {
 	if ( $dest eq '-' ) {
-	    $dest = "firewall_zone";
+	    $dest = firewall_zone;
 	} else {
 	    $dest = join( '', firewall_zone, '::', $dest );
 	}