Fix problem with XSD generation