Hopefully the final migration fix.