fix both 2 type_2_class and class_2_factory lists