@@ -38,11 +38,11 @@
 		if (cls != Nil) {
 			id *instances;
 
 			for (instances = static_instances[i]->instances;
 			    *instances != nil; instances++)
-				(*instances)->isa = cls;
+				object_setClass(*instances, cls);
 
 			static_instances_cnt--;
 
 			if (static_instances_cnt == 0) {
 				free(static_instances);
@@ -75,11 +75,11 @@
 		if (cls != Nil) {
 			id *instances;
 
 			for (instances = (*si)->instances; *instances != nil;
 			    instances++)
-				(*instances)->isa = cls;
+				object_setClass(*instances, cls);
 		} else {
 			if (static_instances == NULL)
 				static_instances = malloc(sizeof(
 				    struct objc_abi_static_instances*));
 			else