@@ -142,12 +142,12 @@
 	CFWFile *file = ptr;
 	const char *path = va_arg(args, const char*);
 	const char *mode = va_arg(args, const char*);
 	int flags;
 
-	/* Make sure we have a valid pointer in case we error out */
-	file->stream.ops = NULL;
+	/* Make sure we have a valid file in case we error out */
+	cfw_stream->ctor(ptr, args);
 	file->eof = false;
 
 	if ((flags = parse_mode(mode)) == -1)
 		return false;
 
@@ -160,11 +160,11 @@
 }
 
 static void
 dtor(void *ptr)
 {
-	cfw_stream_close(ptr);
+	cfw_stream->dtor(ptr);
 }
 
 static CFWClass class = {
 	.name = "CFWFile",
 	.size = sizeof(CFWFile),