@@ -844,10 +844,13 @@
 	struct objc_object *object;
 
 	if (object_ == nil)
 		return Nil;
 
+	if (object_isTaggedPointer(object_))
+		return object_getTaggedPointerClass(object_);
+
 	object = (struct objc_object *)object_;
 
 	return object->isa;
 }