diff --git a/app/src/main/java/org/linphone/ui/call/fragment/EndedCallFragment.kt b/app/src/main/java/org/linphone/ui/call/fragment/EndedCallFragment.kt
index 85d55bc9f..78509f3c8 100644
--- a/app/src/main/java/org/linphone/ui/call/fragment/EndedCallFragment.kt
+++ b/app/src/main/java/org/linphone/ui/call/fragment/EndedCallFragment.kt
@@ -67,6 +67,7 @@ class EndedCallFragment : GenericCallFragment() {
         Log.i("$TAG Showing ended call fragment")
 
         callViewModel.callDuration.observe(viewLifecycleOwner) { duration ->
+            // TODO FIXME: doesn't work
             binding.chronometer.base = SystemClock.elapsedRealtime() - (1000 * duration)
             // Do not start it!
         }
diff --git a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactNewOrEditViewModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactNewOrEditViewModel.kt
index eb5963990..4f5bb5758 100644
--- a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactNewOrEditViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactNewOrEditViewModel.kt
@@ -143,8 +143,8 @@ class ContactNewOrEditViewModel @UiThread constructor() : ViewModel() {
 
             val vCard = friend.vcard
             if (vCard != null) {
-                vCard.familyName = fn
-                vCard.givenName = ln
+                vCard.givenName = fn
+                vCard.familyName = ln
 
                 val picture = picturePath.value.orEmpty()
                 if (picture.isNotEmpty()) {