Fixed bug where headers were not disabled proper