Fix H1 overlapping issues