Fix reorg handling
Merge pull request #85 from aalness/andy_reorg_fix

Fix reorg handling