Parsing header fix