Hack/Fix to support the parsing of combined header fields