diff --git a/src/Client.js b/src/Client.js
index 850d9ec..97a2a89 100644
--- a/src/Client.js
+++ b/src/Client.js
@@ -933,7 +933,8 @@ class Client extends EventEmitter {
         if (inviteInfo.inviteCodeExp == 0) throw 'Expired invite code';
         return this.pupPage.evaluate(async inviteInfo => {
             let { groupId, fromId, inviteCode, inviteCodeExp } = inviteInfo;
-            return await window.Store.JoinInviteV4.sendJoinGroupViaInviteV4(inviteCode, String(inviteCodeExp), groupId, fromId);
+            let userWid = window.Store.WidFactory.createWid(fromId);
+            return await window.Store.JoinInviteV4.joinGroupViaInviteV4(inviteCode, String(inviteCodeExp), groupId, userWid);
         }, inviteInfo);
     }
 
diff --git a/src/structures/Message.js b/src/structures/Message.js
index 9c9e051..e774025 100644
--- a/src/structures/Message.js
+++ b/src/structures/Message.js
@@ -168,8 +168,8 @@ class Message extends Base {
             inviteCodeExp: data.inviteCodeExp,
             groupId: data.inviteGrp,
             groupName: data.inviteGrpName,
-            fromId: data.from._serialized,
-            toId: data.to._serialized
+            fromId: data.from?._serialized ? data.from._serialized : data.from,
+            toId: data.to?._serialized ? data.to._serialized : data.to
         } : undefined;
 
         /**
diff --git a/src/util/Injected.js b/src/util/Injected.js
index 9e2bd90..86d56ed 100644
--- a/src/util/Injected.js
+++ b/src/util/Injected.js
@@ -45,7 +45,7 @@ exports.ExposeStore = (moduleRaidStr) => {
     window.Store.PresenceUtils = window.mR.findModule('sendPresenceAvailable')[0];
     window.Store.ChatState = window.mR.findModule('sendChatStateComposing')[0];
     window.Store.GroupParticipants = window.mR.findModule('promoteParticipants')[0];
-    window.Store.JoinInviteV4 = window.mR.findModule('sendJoinGroupViaInviteV4')[0];
+    window.Store.JoinInviteV4 = window.mR.findModule('queryGroupInviteV4')[0];
     window.Store.findCommonGroups = window.mR.findModule('findCommonGroups')[0].findCommonGroups;
     window.Store.StatusUtils = window.mR.findModule('setMyStatus')[0];
     window.Store.ConversationMsgs = window.mR.findModule('loadEarlierMsgs')[0];