diff --git a/src/services/service.ts b/src/services/service.ts
index e01f139..9d6c177 100755
--- a/src/services/service.ts
+++ b/src/services/service.ts
@@ -1194,8 +1194,12 @@ export default class Services {
     this.device2Ready = false;
   }
 
+
+  // Handle the handshake message
   public async handleHandshakeMsg(url: string, parsedMsg: any) {
-    const us = this
+    // Get the current user
+    const us = this.getMemberFromDevice();
+    console.log("Je suis le us de la fonction handleHandshakeMsg:", us);
     try {
       const handshakeMsg: HandshakeMessage = JSON.parse(parsedMsg);
       this.updateRelay(url, handshakeMsg.sp_address);
@@ -1206,7 +1210,7 @@ export default class Services {
         // console.log('Received members:');
         // console.log(handshakeMsg.peers_list);
         for (const [processId, member] of Object.entries(handshakeMsg.peers_list)) {
-          this.membersList[processId] = member;
+          this.membersList[processId] = member as Member;
         }
       }