diff --git a/app/build.gradle b/app/build.gradle
index 4f65272b..82168236 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -62,7 +62,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:1539cc92c2'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:09e6c15f70'
     implementation 'org.greenrobot:eventbus:3.2.0'
     implementation 'com.klinkerapps:android-smsmms:5.2.6'
     implementation 'com.github.tibbi:IndicatorFastScroll:4524cd0b61'
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt
index f585fa9d..0acf8c98 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt
@@ -10,6 +10,7 @@ import com.reddit.indicatorfastscroll.FastScrollItemIndicator
 import com.simplemobiletools.commons.dialogs.RadioGroupDialog
 import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.helpers.*
+import com.simplemobiletools.commons.models.PhoneNumber
 import com.simplemobiletools.commons.models.RadioItem
 import com.simplemobiletools.commons.models.SimpleContact
 import com.simplemobiletools.smsmessenger.R
@@ -151,7 +152,7 @@ class NewConversationActivity : SimpleActivity() {
                     }
 
                     RadioGroupDialog(this, items) {
-                        launchThreadActivity(it as String, contact.name)
+                        launchThreadActivity((it as PhoneNumber).normalizedNumber, contact.name)
                     }
                 } else {
                     launchThreadActivity(phoneNumbers.first().normalizedNumber, contact.name)
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
index ebcbcea0..7cef449b 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
@@ -901,9 +901,9 @@ class ThreadActivity : SimpleActivity() {
                         if (participant.name == it.normalizedNumber) {
                             participant.name = number
                         }
-                        number
+                        PhoneNumber(number, 0, "", number)
                     } else {
-                        it
+                        PhoneNumber(it.normalizedNumber, 0, "", it.normalizedNumber)
                     }
                 } as ArrayList<PhoneNumber>
             }