--- a/mod_firewall/conditions.lib.lua	Fri Dec 29 16:28:47 2017 +0100
+++ b/mod_firewall/conditions.lib.lua	Sat Dec 30 23:53:41 2017 +0100
@@ -116,8 +116,8 @@
 end
 
 function condition_handlers.SUBSCRIBED()
-	return "(to_node and rostermanager.is_contact_subscribed(to_node, to_host, bare_from))",
-	       { "rostermanager", "split_to", "bare_from" };
+	return "(bare_to == bare_from or to_node and rostermanager.is_contact_subscribed(to_node, to_host, bare_from))",
+	       { "rostermanager", "split_to", "bare_to", "bare_from" };
 end
 
 function condition_handlers.PAYLOAD(payload_ns)