migration fix try 3