HOTFIX: header layout