Fixed a problem related to header