--- a/mod_firewall/conditions.lib.lua	Fri Mar 11 18:16:38 2016 +0100
+++ b/mod_firewall/conditions.lib.lua	Fri Mar 11 18:18:04 2016 +0100
@@ -33,7 +33,7 @@
 		else
 			pattern = pattern:gsub("%p", "%%%0"):gsub("%%(%p)", wildcard_equivs);
 		end
-		return ("%s:match(%q)"):format(part, "^"..pattern.."$");
+		return ("(%s and %s:match(%q))"):format(part, part, "^"..pattern.."$");
 	else
 		return ("%s == %q"):format(part, match);
 	end