Bugfix for upstream firewall changes