Fix header overlapping, take 2.