Fix firewall chaneg_when clause