Fix xml issue