diff --git a/MPChartLib/build.gradle b/MPChartLib/build.gradle
index 6a97e554e6..881c995a06 100644
--- a/MPChartLib/build.gradle
+++ b/MPChartLib/build.gradle
@@ -4,13 +4,13 @@ apply plugin: 'com.github.dcendents.android-maven'
 group='com.github.philjay'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 30
+    buildToolsVersion '30.0.2'
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode 3
-        versionName '3.1.2'
+        versionName '3.1.3'
     }
     buildTypes {
         release {
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.java b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.java
index b0a4b93cdd..01be49770f 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.java
@@ -720,7 +720,7 @@ public void highlightValue(Highlight high, boolean callListener) {
         if (callListener && mSelectionListener != null) {
 
             if (!valuesToHighlight()) {
-                if (!isNonSelectMode) mSelectionListener.onNothingSelected();
+                if (!isReselectMode) mSelectionListener.onNothingSelected();
             } else {
                 // notify the listener
                 mSelectionListener.onValueSelected(e, high);
@@ -1830,18 +1830,18 @@ public void setUnbindEnabled(boolean enabled) {
     /**
      * non select mode, don t use reselect pie
      */
-    private boolean isNonSelectMode = true;
+    private boolean isReselectMode = false;
 
     /**
      * Set non select mode
      *
      * @param enable
      */
-    public void setNonSelectMode(boolean enable) {
-        this.isNonSelectMode = enable;
+    public void setReselectMode(boolean enable) {
+        this.isReselectMode = enable;
     }
 
-    public boolean isNonSelectMode() {
-        return this.isNonSelectMode;
+    public boolean isReselectMode() {
+        return this.isReselectMode;
     }
 }
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/listener/ChartTouchListener.java b/MPChartLib/src/main/java/com/github/mikephil/charting/listener/ChartTouchListener.java
index 75c8e864b4..0caa5052db 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/listener/ChartTouchListener.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/listener/ChartTouchListener.java
@@ -118,8 +118,10 @@ public ChartGesture getLastGesture() {
     protected void performHighlight(Highlight h, MotionEvent e) {
 
         if (h == null || h.equalTo(mLastHighlighted)) {
-            mChart.highlightValue(null, true);
-            mLastHighlighted = null;
+            if (mChart.isReselectMode()) {
+                mChart.highlightValue(null, true);
+                mLastHighlighted = null;
+            }
         } else {
             mChart.highlightValue(h, true);
             mLastHighlighted = h;
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/listener/PieRadarChartTouchListener.java b/MPChartLib/src/main/java/com/github/mikephil/charting/listener/PieRadarChartTouchListener.java
index d3527f924a..8ad9ca9de9 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/listener/PieRadarChartTouchListener.java
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/listener/PieRadarChartTouchListener.java
@@ -136,7 +136,6 @@ public boolean onSingleTapConfirmed(MotionEvent e) {
 
     @Override
     public boolean onSingleTapUp(MotionEvent e) {
-
         mLastGesture = ChartGesture.SINGLE_TAP;
 
         OnChartGestureListener l = mChart.getOnChartGestureListener();