correct ordering to match debug order.