Migration more robust