Fix header overlapping