diff --git a/package.json b/package.json
index f70b479..d681334 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,12 @@
 {
 	"name": "@lumeweb/kernel-protomux-client",
-    "version": "0.1.0",
-    "main": "dist/index.js",
+	"version": "0.1.0",
+	"main": "dist/index.js",
 	"dependencies": {
 		"@lumeweb/kernel-swarm-client": "git+https://git.lumeweb.com/LumeWeb/kernel-swarm-client.git",
 		"@lumeweb/libkernel-universal": "git+https://git.lumeweb.com/LumeWeb/libkernel-universal.git",
 		"b4a": "^1.6.3",
+		"buffer": "^6.0.3",
 		"p-defer": "^4.0.0"
 	},
 	"devDependencies": {
diff --git a/src/index.ts b/src/index.ts
index 2c355b0..258185f 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -4,6 +4,7 @@ import { MODULE } from "@lumeweb/kernel-swarm-client";
 
 import defer from "p-defer";
 import b4a from "b4a";
+import { Buffer } from "buffer";
 
 export default class Protomux {
   private isProtomux = true;
@@ -219,7 +220,7 @@ class Message extends Client {
         if (data.args) {
           data.args = data.args.filter((arg: any) => {
             if (arg instanceof Uint8Array) {
-              return b4a.from(arg);
+              return Buffer.from(arg);
             }
 
             return arg;
@@ -227,7 +228,7 @@ class Message extends Client {
         }
 
         if (data?.args && data?.args[0]?.buffer instanceof Uint8Array) {
-          data.args[0].buffer = b4a.from(data.args[0].buffer);
+          data.args[0].buffer = Buffer.from(data.args[0].buffer);
         }
         switch (data.action) {
           case "encode":