diff --git a/app/build.gradle b/app/build.gradle
index 88c15e52..a0f73395 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,6 +61,6 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:4d36cc84e9'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:52e88a4bfb'
     implementation 'com.github.tibbi:IndicatorFastScroll:4524cd0b61'
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialpadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialpadActivity.kt
index 38f673c0..2a966aec 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialpadActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialpadActivity.kt
@@ -235,7 +235,7 @@ class DialpadActivity : SimpleActivity() {
         })
 
         ContactsAdapter(this, filtered, dialpad_list, null, text) {
-            startCallIntent((it as SimpleContact).phoneNumbers.first())
+            startCallIntent((it as SimpleContact).phoneNumbers.first().normalizedNumber)
         }.apply {
             dialpad_list.adapter = this
         }
diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/ManageSpeedDialActivity.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/ManageSpeedDialActivity.kt
index c955cf3f..4e9aa01b 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/ManageSpeedDialActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/ManageSpeedDialActivity.kt
@@ -45,7 +45,7 @@ class ManageSpeedDialActivity : SimpleActivity(), RemoveSpeedDialListener {
             SelectContactDialog(this, allContacts) { selectedContact ->
                 speedDialValues.first { it.id == clickedContact.id }.apply {
                     displayName = selectedContact.name
-                    number = selectedContact.phoneNumbers.first()
+                    number = selectedContact.phoneNumbers.first().normalizedNumber
                 }
                 updateAdapter()
             }
diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/ContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/ContactsAdapter.kt
index 291cf9b9..4850fd6e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/ContactsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/adapters/ContactsAdapter.kt
@@ -118,7 +118,7 @@ class ContactsAdapter(
     @SuppressLint("MissingPermission")
     private fun callContact(useSimOne: Boolean) {
         val number = getSelectedPhoneNumber() ?: return
-        activity.callContactWithSim(number, useSimOne)
+        activity.callContactWithSim(number.normalizedNumber, useSimOne)
     }
 
     private fun removeDefaultSIM() {
@@ -193,7 +193,7 @@ class ContactsAdapter(
                     activity.handlePermission(PERMISSION_CALL_PHONE) { hasPermission ->
                         val action = if (hasPermission) Intent.ACTION_CALL else Intent.ACTION_DIAL
                         val intent = Intent(action).apply {
-                            data = Uri.fromParts("tel", contact.phoneNumbers.first(), null)
+                            data = Uri.fromParts("tel", contact.phoneNumbers.first().normalizedNumber, null)
                         }
 
                         val shortcut = ShortcutInfo.Builder(activity, contact.hashCode().toString())
diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/FavoritesFragment.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/FavoritesFragment.kt
index 6f8c9d98..ea20a9aa 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/FavoritesFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/FavoritesFragment.kt
@@ -98,15 +98,15 @@ class FavoritesFragment(context: Context, attributeSet: AttributeSet) : MyViewPa
     private fun callContact(simpleContact: SimpleContact) {
         val phoneNumbers = simpleContact.phoneNumbers
         if (phoneNumbers.size <= 1) {
-            activity?.launchCallIntent(phoneNumbers.first())
+            activity?.launchCallIntent(phoneNumbers.first().normalizedNumber)
         } else {
             val items = ArrayList<RadioItem>()
             phoneNumbers.forEachIndexed { index, phoneNumber ->
-                items.add(RadioItem(index, phoneNumber))
+                items.add(RadioItem(index, phoneNumber.normalizedNumber))
             }
 
             RadioGroupDialog(activity!!, items) {
-                activity?.launchCallIntent(phoneNumbers[it as Int])
+                activity?.launchCallIntent(phoneNumbers[it as Int].normalizedNumber)
             }
         }
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/RecentsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/RecentsFragment.kt
index 59db6c6b..4494cdc7 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/RecentsFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/fragments/RecentsFragment.kt
@@ -63,7 +63,7 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
                     }
 
                     if (!wasNameFilled) {
-                        val contact = contacts.firstOrNull { it.phoneNumbers.first() == recent.phoneNumber }
+                        val contact = contacts.firstOrNull { it.phoneNumbers.first().normalizedNumber == recent.phoneNumber }
                         if (contact != null) {
                             recent.name = contact.name
                         }
diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/RecentsHelper.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/RecentsHelper.kt
index 58af2cc5..7954d78a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/RecentsHelper.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/RecentsHelper.kt
@@ -90,8 +90,8 @@ class RecentsHelper(private val context: Context) {
                         val normalizedNumber = number.normalizePhoneNumber()
                         if (normalizedNumber!!.length >= COMPARABLE_PHONE_NUMBER_LENGTH) {
                             name = contacts.firstOrNull { contact ->
-                                val curNumber = contact.phoneNumbers.first().normalizePhoneNumber()
-                                if (curNumber!!.length >= COMPARABLE_PHONE_NUMBER_LENGTH) {
+                                val curNumber = contact.phoneNumbers.first().normalizedNumber
+                                if (curNumber.length >= COMPARABLE_PHONE_NUMBER_LENGTH) {
                                     if (curNumber.substring(curNumber.length - COMPARABLE_PHONE_NUMBER_LENGTH) == normalizedNumber.substring(normalizedNumber.length - COMPARABLE_PHONE_NUMBER_LENGTH)) {
                                         contactsNumbersMap[number] = contact.name
                                         return@firstOrNull true