Fixed Parsing of XML