fix reorg mixup