Fix migration problem
Merge pull request #44 from keysen/master

Problem when migrating