[BUGFIX] Invalid handling of XML data