Attempt # 2 at fixing migration problem