Corrected support for XML.