#28: xsd fixed