diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index f12ca257d2..7125f6cf85 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -1121,7 +1121,7 @@ function generate_user_filter_rule($rule, $ngcounter) {
 					$not = "";
 
 				if (stristr($expsrc, "$"))
-					$src = "{$not} {$expsrc}";
+					$src = "{$not} " . alias_expand_value($rule['source']['address']);
 				else
 					$src = "{ {$not} {$expsrc} }";
 			}
@@ -1198,7 +1198,7 @@ function generate_user_filter_rule($rule, $ngcounter) {
 					$not = "";
 
 				if (stristr($expdst, "$"))
-					$dst = "{$not} {$expdst}";
+					$dst = "{$not} " . alias_expand_value($rule['destination']['address']);
 				else
 					$dst = "{ {$not} {$expdst} }";
 			}
@@ -2139,4 +2139,4 @@ function return_vpn_subnet($adr) {
 	return " # error - {$adr['network']} ";
 	
 }
-?>
+?>
\ No newline at end of file