Make sure original headers are conserved