Resolve issue During Migration