diff --git a/chartLib/src/main/kotlin/info/appdev/charting/components/Legend.kt b/chartLib/src/main/kotlin/info/appdev/charting/components/Legend.kt
index 5d49ef07..1c94e9fc 100644
--- a/chartLib/src/main/kotlin/info/appdev/charting/components/Legend.kt
+++ b/chartLib/src/main/kotlin/info/appdev/charting/components/Legend.kt
@@ -366,7 +366,9 @@ class Legend() : ComponentBase() {
                 var i = 0
                 while (i < entryCount) {
                     val e = entries[i]
-                    if (e == null) { i++; continue }
+                    if (e == null) {
+                        i++; continue
+                    }
                     val drawingForm = e.form != LegendForm.NONE
                     val formSize = if (e.formSize.isNaN())
                         defaultFormSize
@@ -427,7 +429,9 @@ class Legend() : ComponentBase() {
                 var i = 0
                 while (i < entryCount) {
                     val legendEntry = entries[i]
-                    if (legendEntry == null) { i++; continue }
+                    if (legendEntry == null) {
+                        i++; continue
+                    }
                     val drawingForm = legendEntry.form != LegendForm.NONE
                     val formSize = if (legendEntry.formSize.isNaN())
                         defaultFormSize
@@ -447,9 +451,10 @@ class Legend() : ComponentBase() {
 
                     // grouped forms have null labels
                     if (label != null) {
-                        calculatedLabelSizes.add(labelPaint.calcTextSize(label))
+                        val fSize = labelPaint.calcTextSize(label)
+                        calculatedLabelSizes.add(fSize)
                         requiredWidth += if (drawingForm) formToTextSpace + formSize else 0f
-                        requiredWidth += calculatedLabelSizes.last().width
+                        requiredWidth += fSize.width
                     } else {
                         calculatedLabelSizes.add(FSize.getInstance(0f, 0f))
                         requiredWidth += if (drawingForm) formSize else 0f