diff --git a/src/Client.js b/src/Client.js
index 2720c1c..5123c2a 100644
--- a/src/Client.js
+++ b/src/Client.js
@@ -857,9 +857,10 @@ class Client extends EventEmitter {
      */
     async getFormattedNumber(number) {
         if(!number.endsWith('@s.whatsapp.net')) number = number.replace('c.us', 's.whatsapp.net');
-
+        if(!number.includes('@s.whatsapp.net')) number = `${number}@s.whatsapp.net`;
+        
         return await this.pupPage.evaluate(async numberId => {
-            return window.NumberInfo.formattedPhoneNumber(numberId);
+            return window.Store.NumberInfo.formattedPhoneNumber(numberId);
         }, number);
     }
     
@@ -872,7 +873,7 @@ class Client extends EventEmitter {
         number = number.replace(' ', '').replace('+', '').replace('@c.us', '');
 
         return await this.pupPage.evaluate(async numberId => {
-            return window.NumberInfo.findCC(numberId);
+            return window.Store.NumberInfo.findCC(numberId);
         }, number);
     }
     
diff --git a/src/util/Injected.js b/src/util/Injected.js
index 5e1ae7c..5bf0884 100644
--- a/src/util/Injected.js
+++ b/src/util/Injected.js
@@ -21,7 +21,7 @@ exports.ExposeStore = (moduleRaidStr) => {
     window.Store.MediaPrep = window.mR.findModule('MediaPrep')[0];
     window.Store.MediaObject = window.mR.findModule('getOrCreateMediaObject')[0];
     window.Store.MediaUpload = window.mR.findModule('uploadMedia')[0];
-    window.Store.NumberInfo = window.mR.findModule('formatNumber')[0];
+    window.Store.NumberInfo = window.mR.findModule('formattedPhoneNumber')[0];
     window.Store.Cmd = window.mR.findModule('Cmd')[0].default;
     window.Store.MediaTypes = window.mR.findModule('msgToMediaType')[0];
     window.Store.VCard = window.mR.findModule('vcardFromContactModel')[0];
diff --git a/tests/client.js b/tests/client.js
index 36bd425..dde89e8 100644
--- a/tests/client.js
+++ b/tests/client.js
@@ -438,6 +438,24 @@ END:VCARD`;
                 const numberId = await client.getNumberId(number);
                 expect(numberId).to.eql(null);
             });
+
+            it('can get a number\'s country code', async function () {
+                const number = '18092201111';
+                const countryCode = await client.getCountryCode(number);
+                expect(countryCode).to.eql('1');
+            });
+
+            it('can get a formatted number', async function () {
+                const number = '18092201111';
+                const formatted = await client.getFormattedNumber(number);
+                expect(formatted).to.eql('+1 (809) 220-1111');
+            });
+
+            it('can get a formatted number from a serialized ID', async function () {
+                const number = '18092201111@c.us';
+                const formatted = await client.getFormattedNumber(number);
+                expect(formatted).to.eql('+1 (809) 220-1111');
+            });
         });
     });
 });
\ No newline at end of file