diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BubbleChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BubbleChartRenderer.kt
index 7d9ca6c51..3edc18334 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BubbleChartRenderer.kt
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BubbleChartRenderer.kt
@@ -49,7 +49,7 @@ open class BubbleChartRenderer(
 
         val phaseY = animator.phaseY
 
-        xBounds[dataProvider] = dataSet
+        xBounds.set(dataProvider, dataSet)
 
         sizeBuffer[0] = 0f
         sizeBuffer[2] = 1f
@@ -111,7 +111,7 @@ open class BubbleChartRenderer(
                 val phaseX = max(0.0, min(1.0, animator.phaseX.toDouble())).toFloat()
                 val phaseY = animator.phaseY
 
-                xBounds[dataProvider] = dataSet
+                xBounds.set(dataProvider, dataSet)
 
                 dataProvider.getTransformer(dataSet.axisDependency)?.let { transformer ->
                     val positions = transformer.generateTransformedValuesBubble(dataSet, phaseY, xBounds.min, xBounds.max)
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/CandleStickChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/CandleStickChartRenderer.kt
index e890a4775..ccc8ed47b 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/CandleStickChartRenderer.kt
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/CandleStickChartRenderer.kt
@@ -39,7 +39,7 @@ open class CandleStickChartRenderer(
         val barSpace = dataSet.barSpace
         val showCandleBar = dataSet.showCandleBar
 
-        xBounds[dataProvider] = dataSet
+        xBounds.set(dataProvider, dataSet)
 
         paintRender.strokeWidth = dataSet.shadowWidth
 
@@ -222,7 +222,7 @@ open class CandleStickChartRenderer(
 
                 val trans = dataProvider.getTransformer(dataSet.axisDependency)
 
-                xBounds[dataProvider] = dataSet
+                xBounds.set(dataProvider, dataSet)
 
                 val positions = trans!!.generateTransformedValuesCandle(
                     dataSet, animator.phaseX, animator.phaseY, xBounds.min, xBounds.max
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.kt
index 2eaceedaa..941f69f2e 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.kt
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.kt
@@ -104,7 +104,7 @@ open class LineChartRenderer(
 
         val trans = dataProvider.getTransformer(dataSet.axisDependency)
 
-        xBounds[dataProvider] = dataSet
+        xBounds.set(dataProvider, dataSet)
 
         cubicPath.reset()
 
@@ -154,7 +154,7 @@ open class LineChartRenderer(
 
         val trans = dataProvider.getTransformer(dataSet.axisDependency)
 
-        xBounds[dataProvider] = dataSet
+        xBounds.set(dataProvider, dataSet)
 
         val intensity = dataSet.cubicIntensity
 
@@ -263,7 +263,7 @@ open class LineChartRenderer(
             c
         }
 
-        xBounds[dataProvider] = dataSet
+        xBounds.set(dataProvider, dataSet)
 
         // if drawing filled is enabled
         if (dataSet.isDrawFilledEnabled && entryCount > 0) {
@@ -507,7 +507,7 @@ open class LineChartRenderer(
 
                 if (!dataSet.isDrawCirclesEnabled) valOffset = valOffset / 2
 
-                xBounds[dataProvider] = dataSet
+                xBounds.set(dataProvider, dataSet)
 
                 val positions = trans!!.generateTransformedValuesLine(
                     dataSet, animator.phaseX, animator
@@ -599,7 +599,7 @@ open class LineChartRenderer(
 
             val trans = dataProvider.getTransformer(dataSet.axisDependency)
 
-            xBounds[dataProvider] = dataSet
+            xBounds.set(dataProvider, dataSet)
 
             val circleRadius = dataSet.circleRadius
             val circleHoleRadius = dataSet.circleHoleRadius
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/ScatterChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/ScatterChartRenderer.kt
index cfff248bf..6f7bfa3da 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/ScatterChartRenderer.kt
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/ScatterChartRenderer.kt
@@ -88,7 +88,7 @@ open class ScatterChartRenderer(@JvmField var dataProvider: ScatterDataProvider,
                 // apply the text-styling defined by the DataSet
                 applyValueTextStyle(dataSet)
 
-                xBounds[dataProvider] = dataSet
+                xBounds.set(dataProvider, dataSet)
 
                 val positions = dataProvider.getTransformer(dataSet.axisDependency)!!.generateTransformedValuesScatter(
                     dataSet,