Reorg bug fix.