Fix annoying random behaviour on header
Merge pull request #546 from typesafehub/fix/header

Fix annoying random behaviour on header