Fix to xml output