Fix broken header
Merge branch 'bug/broken-header' into development