fix header structure