Alternate attempt to fix headers