Fix race in Header

Fixes #49. Sorry for the dupe issue - I keep forgetting the PR itself is a discussion thread.