* One more change to the recent header folding bugfix