Fix header behavior. (issue #45)