refactor XmlFix