fix the fixing of header problems