Fix header handler for forwarder