migration fix try 2