Attempt to fix headers