Fix header overlapping bug