fix headers handling
fix wording
Merge pull request #2122 from matiu/bug/headers

WIP: fix headers handling