Trying to fix erroneous header folding