Fix loss of row order data