Fixed XML Parsing special cases