Further migration fix