diff --git a/Shorewall-perl/Shorewall/Chains.pm b/Shorewall-perl/Shorewall/Chains.pm
index 4533ba698..247751fb0 100644
--- a/Shorewall-perl/Shorewall/Chains.pm
+++ b/Shorewall-perl/Shorewall/Chains.pm
@@ -1152,7 +1152,7 @@ sub do_test ( $$ )
 
     validate_mark $testval;
 
-    $testval .= '/0xFFFF' unless ( $testval =~ '/' );
+    $testval = join('/', $testval, $mask ) unless ( $testval =~ '/' );
 
     "$match $testval ";
 }