Post migration fix for #321