Fix bug for headers