XSD fix