fixed migration issues on sprint