diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/buffer/AbstractBuffer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/buffer/AbstractBuffer.kt
index 13e971a5f..02bc6b979 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/buffer/AbstractBuffer.kt
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/buffer/AbstractBuffer.kt
@@ -12,7 +12,7 @@ abstract class AbstractBuffer<T>(size: Int) {
 
     /** float-buffer that holds the data points to draw, order: x,y,x,y,...  */
     @JvmField
-    val buffer: FloatArray
+    var buffer: MutableList<Float> = mutableListOf()
 
     /** animation phase x-axis  */
     @JvmField
@@ -30,7 +30,7 @@ abstract class AbstractBuffer<T>(size: Int) {
 
     init {
         index = 0
-        buffer = FloatArray(size)
+        buffer = FloatArray(size).toMutableList()
     }
 
     /** limits the drawing on the x-axis  */
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/buffer/BarBuffer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/buffer/BarBuffer.kt
index 89b8eda43..df00daf5f 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/buffer/BarBuffer.kt
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/buffer/BarBuffer.kt
@@ -48,7 +48,7 @@ open class BarBuffer(size: Int, dataSetCount: Int, containsStacks: Boolean) : Ab
                 ", containsStacks=" + containsStacks +
                 ", inverted=" + inverted +
                 ", barWidth=" + barWidth +
-                ", buffer=" + buffer.contentToString() +
+                ", buffer=" + buffer +
                 ", index=" + index +
                 '}'
     }
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarChartRenderer.kt
index 423afcd73..615b2dc43 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarChartRenderer.kt
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarChartRenderer.kt
@@ -59,11 +59,11 @@ open class BarChartRenderer(
         val barData = chart.barData
         barBuffers = mutableListOf()
 
-        barData.dataSets.forEach {
+        barData.dataSets.forEach { iBarDataSet ->
             barBuffers.add(
                 BarBuffer(
-                    it.entryCount * 4 * (if (it.isStacked) it.stackSize else 1),
-                    barData.dataSetCount, it.isStacked
+                    iBarDataSet.entryCount * 4 * (if (iBarDataSet.isStacked) iBarDataSet.stackSize else 1),
+                    barData.dataSetCount, iBarDataSet.isStacked
                 )
             )
         }
@@ -163,7 +163,7 @@ open class BarChartRenderer(
             setBarWidth(chart.barData.barWidth)
             feed(dataSet)
         }
-        trans!!.pointValuesToPixel(buffer.buffer)
+        trans!!.pointValuesToPixel(buffer.buffer.toFloatArray())
 
         val isCustomFill = dataSet.fills != null && dataSet.fills.isNotEmpty()
         val isSingleColor = dataSet.colors.size == 1
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.kt
index 6ef1bd3d9..e09c4889a 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.kt
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.kt
@@ -104,9 +104,9 @@ open class HorizontalBarChartRenderer(
 
         buffer.feed(dataSet)
 
-        trans!!.pointValuesToPixel(buffer.buffer)
+        trans!!.pointValuesToPixel(buffer.buffer.toFloatArray())
 
-        val isCustomFill = dataSet.fills != null && dataSet.fills.isNotEmpty()
+        val isCustomFill = dataSet.fills != null && !dataSet.fills.isEmpty()
         val isSingleColor = dataSet.colors.size == 1
         val isInverted = chart.isInverted(dataSet.axisDependency)
 
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RoundedBarChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RoundedBarChartRenderer.kt
index 1bb9d14de..9f463f0d8 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RoundedBarChartRenderer.kt
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RoundedBarChartRenderer.kt
@@ -79,13 +79,13 @@ class RoundedBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator, v
             }
         }
 
-        val buffer = barBuffers!![index]!!
+        val buffer = barBuffers[index]!!
         buffer.setPhases(phaseX, phaseY)
         buffer.setDataSet(index)
         buffer.setInverted(chart.isInverted(dataSet.axisDependency))
         buffer.setBarWidth(chart.barData.barWidth)
         buffer.feed(dataSet)
-        trans!!.pointValuesToPixel(buffer.buffer)
+        trans!!.pointValuesToPixel(buffer.buffer.toFloatArray())
 
         // if multiple colors has been assigned to Bar Chart
         if (dataSet.colors.size > 1) {
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RoundedHorizontalBarChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RoundedHorizontalBarChartRenderer.kt
index e59ff54b8..2e9e70745 100644
--- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RoundedHorizontalBarChartRenderer.kt
+++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RoundedHorizontalBarChartRenderer.kt
@@ -86,7 +86,7 @@ class RoundedHorizontalBarChartRenderer(chart: BarDataProvider, animator: ChartA
         buffer.setInverted(chart.isInverted(dataSet.axisDependency))
         buffer.setBarWidth(chart.barData.barWidth)
         buffer.feed(dataSet)
-        trans!!.pointValuesToPixel(buffer.buffer)
+        trans!!.pointValuesToPixel(buffer.buffer.toFloatArray())
 
         // if multiple colors has been assigned to Bar Chart
         if (dataSet.colors.size > 1) {