diff --git a/src/client/shared/postmessage.ts b/src/client/shared/postmessage.ts
index 33b1054..b436b0c 100644
--- a/src/client/shared/postmessage.ts
+++ b/src/client/shared/postmessage.ts
@@ -55,11 +55,10 @@ export default function (client: ScramjetClient) {
 				};
 
 				// * origin because obviously
-				ctx.args[1] = "*";
+				if (typeof ctx.args[1] === "string") ctx.args[1] = "*";
+				if (typeof ctx.args[1] === "object") ctx.args[1].targetOrigin = "*";
 
-				ctx.return(
-					wrappedPostMessage.call(ctx.fn, ctx.args[0], ctx.args[1], ctx.args[2])
-				);
+				ctx.return(wrappedPostMessage.call(ctx.fn, ...ctx.args));
 			},
 		});
 
diff --git a/src/client/shared/worker.ts b/src/client/shared/worker.ts
index 30c24af..d00bd58 100644
--- a/src/client/shared/worker.ts
+++ b/src/client/shared/worker.ts
@@ -61,7 +61,7 @@ export default function (client: ScramjetClient, self: typeof globalThis) {
 						args[0] += "&type=module";
 					}
 
-					if (args[1].name === "name") {
+					if (args[1].name) {
 						args[1].name = `${client.url.origin}@${args[1].name}`;
 					}
 				}