Fix miss-ordered xml