@@ -422,12 +422,11 @@
 {
 	self = [super initWithClass: class__];
 
 	req_size = size;
 
-	/* FIXME: We need something that works for subclasses as well */
-	if (class__ == [OFTCPSocket class])
+	if ([class__ isSubclassOfClass: [OFTCPSocket class]])
 		err = GET_SOCK_ERR;
 	else
 		err = GET_ERR;
 
 	return self;