Fix xml helper