diff --git a/api/index.py b/api/index.py
index 1b8571b..3fe6f76 100644
--- a/api/index.py
+++ b/api/index.py
@@ -29,12 +29,11 @@ async def handle(req):
     try:
         update = req.json
         print(update)
-        msgdata = update.get('message', update.get('my_chat_member'))
-        if str(msgdata['chat']['id']) == CHAT_ID:
-            chat_id = str(msg['chat']['id'])
-            member_id = str(msg['user']['id'])
-            if msgdata.get('new_chat_member'):
-                msg = msgdata.get('new_chat_member')
+        msg = update.get('message', update.get('my_chat_member'))
+        if str(msg['chat']['id']) == CHAT_ID:
+            if 'new_chat_member' in msg:
+                chat_id = str(msg['chat']['id'])
+                member_id = str(msg['new_chat_member']['id'])
                 print(f'new member {member_id}')
                 newcomers[member_id] = 'newcomer'
                 reply_markup = {
@@ -52,12 +51,13 @@ async def handle(req):
                     reply_markup=reply_markup
                 )
                 newcomers[member_id] = 'newcomer' + welcome_msg_id
-            elif msgdata.get('text'):
-                msg = msgdata.get('text')
+            elif 'text' in msg:
+                chat_id = str(msg['chat']['id'])
+                member_id = str(msg['from']['id'])
                 data = newcomers[member_id]
                 if data:
                     if data.startswith('newcomer'):
-                        if 'text' in msg:
+                        if msg:
                             answer = msg['text']
                             if BUTTON_OK.lower() in answer.lower():
                                 del newcomers[member_id]