Fixing the firewall commit issue