diff --git a/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt b/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt
index dff4ed7..9a7ffec 100644
--- a/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt
+++ b/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt
@@ -93,15 +93,6 @@ class MatchActivity : AppCompatActivity() {
         updateUI()
     }
 
-    override fun onBackPressed() {
-        if (matchModel?.pointId == 0)
-            super.onBackPressed()
-        else {
-            matchModel?.undo()
-            updateUI()
-        }
-    }
-
     fun updateUI() {
         matchModel?.apply {
             textScore?.text = getString(
@@ -204,4 +195,13 @@ class MatchActivity : AppCompatActivity() {
             hashMapOf(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID to "TTS")
         )
     }
+
+    override fun onBackPressed() {
+        if (matchModel?.pointId == 0)
+            super.onBackPressed()
+        else {
+            matchModel?.undo()
+            updateUI()
+        }
+    }
 }
diff --git a/app/src/main/java/adrienmalin/pingpoints/MatchModel.kt b/app/src/main/java/adrienmalin/pingpoints/MatchModel.kt
index 4a6a535..8f268f2 100644
--- a/app/src/main/java/adrienmalin/pingpoints/MatchModel.kt
+++ b/app/src/main/java/adrienmalin/pingpoints/MatchModel.kt
@@ -12,7 +12,7 @@ class MatchModel : ViewModel() {
     var relaunchSide: Int = 1
     var ttsEnabled: Boolean = false
     var sttEnabled: Boolean = false
-    var pointId: Int = 0
+    var pointId: Int = -1
     var history: MutableList<Point> = ArrayList()
 
     fun startMatch(player1Name: String, player2Name:String, starterId: Int, enableTTS: Boolean, enableSTT: Boolean) {
@@ -53,7 +53,7 @@ class MatchModel : ViewModel() {
     }
 
     fun undo() {
-        history[pointId--].let {
+        history[--pointId].let {
             players.zip(it.score).forEach{(player, score) -> player.score = score}
             serviceSide = it.serviceSide
             relaunchSide = when(serviceSide) {