Fix header clipping. Closes #617.