diff --git a/app/src/main/java/org/linphone/call/CallIncomingActivity.java b/app/src/main/java/org/linphone/call/CallIncomingActivity.java
index 205c22f47..ee4e34ac9 100644
--- a/app/src/main/java/org/linphone/call/CallIncomingActivity.java
+++ b/app/src/main/java/org/linphone/call/CallIncomingActivity.java
@@ -122,7 +122,7 @@ public class CallIncomingActivity extends LinphoneGenericActivity {
                             Core core, Call call, State state, String message) {
                         if (call == mCall) {
                             if (state == State.Connected) {
-                                // This is done by the Service listener now
+                                // This is done by the LinphoneContext listener now
                                 // startActivity(new Intent(CallOutgoingActivity.this,
                                 // CallActivity.class));
                             }
@@ -230,6 +230,7 @@ public class CallIncomingActivity extends LinphoneGenericActivity {
         mAlreadyAcceptedOrDeniedCall = true;
 
         mCall.terminate();
+        finish();
     }
 
     private void answer() {
diff --git a/app/src/main/java/org/linphone/call/CallOutgoingActivity.java b/app/src/main/java/org/linphone/call/CallOutgoingActivity.java
index 372019192..e797670b3 100644
--- a/app/src/main/java/org/linphone/call/CallOutgoingActivity.java
+++ b/app/src/main/java/org/linphone/call/CallOutgoingActivity.java
@@ -125,7 +125,7 @@ public class CallOutgoingActivity extends LinphoneGenericActivity implements OnC
                                         .show();
                             }
                         } else if (state == State.Connected) {
-                            // This is done by the Service listener now
+                            // This is done by the LinphoneContext listener now
                             // startActivity(new Intent(CallOutgoingActivity.this,
                             // CallActivity.class));
                         }
diff --git a/build.gradle b/build.gradle
index b0c72ac51..e2b619b41 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:3.5.2'
         classpath 'com.google.gms:google-services:4.3.2'
         classpath "com.diffplug.spotless:spotless-plugin-gradle:3.24.2"