A bit of code-style :lipstick:
More resilient migration