Fixing from header parsing in cases with funky whitespace