Fixed and tested migration