2071: Changed yields to match XML order