improve new header support