Fix reordering problems.
Merge pull request #21 from jhorbulyk/Jacob-RemoveDuplicateTable

Fix reordering problems.