Fix xml parsing