Reorg mitigation