Fix bug with headers