Fix reorg handling