Fixed the migration issues
Merge pull request #1 from tkwl/beta

Fixed the migration issues