diff --git a/webwhatsapi/__init__.py b/webwhatsapi/__init__.py
index d5d4c670..ed605420 100755
--- a/webwhatsapi/__init__.py
+++ b/webwhatsapi/__init__.py
@@ -75,7 +75,7 @@ class WhatsAPIDriver(object):
         "firstrun": "#wrapper",
         "qrCode": "canvas",
         "qrCodePlain": "div[data-ref]",
-        "mainPage": ".app.two",
+        "mainPage": ".two",
         "chatList": ".infinite-list-viewport",
         "messageList": "#main > div > div:nth-child(1) > div > div.message-list",
         "unreadMessageBar": "#main > div > div:nth-child(1) > div > div.message-list > div.msg-unread",
diff --git a/webwhatsapi/consts.py b/webwhatsapi/consts.py
index e9f36766..a5c18ba6 100755
--- a/webwhatsapi/consts.py
+++ b/webwhatsapi/consts.py
@@ -4,7 +4,7 @@
 class Selectors(object):
     FIRST_RUN = "#wrapper"
     QR_CODE = ".qrcode > img:nth-child(4)"
-    MAIN_PAGE = ".app.two"
+    MAIN_PAGE = ".two"
     CHAT_LIST = ".infinite-list-viewport"
     MESSAGE_LIST = "#main > div > div:nth-child(1) > div > div.message-list"
     UNREAD_MESSAGE_BAR = (
diff --git a/webwhatsapi/js/wapi.js b/webwhatsapi/js/wapi.js
index 76c36bbb..7147688b 100755
--- a/webwhatsapi/js/wapi.js
+++ b/webwhatsapi/js/wapi.js
@@ -11,7 +11,7 @@ if (!window.Store) {
         function getStore(modules) {
             let foundCount = 0;
             let neededObjects = [
-                { id: "Store", conditions: (module) => (module.Chat && module.Msg) ? module : null },
+                { id: "Store", conditions: (module) => (module.default && module.default.Chat && module.default.Msg) ? module.default : null },
                 { id: "MediaCollection", conditions: (module) => (module.default && module.default.prototype && module.default.prototype.processAttachments) ? module.default : null },
                 { id: "MediaProcess", conditions: (module) => (module.BLOB) ? module : null },
                 { id: "Wap", conditions: (module) => (module.createGroup) ? module : null },