diff --git a/modules/backend/assets/js/october-min.js b/modules/backend/assets/js/october-min.js
index 70ed8786f..6a8ddfce1 100644
--- a/modules/backend/assets/js/october-min.js
+++ b/modules/backend/assets/js/october-min.js
@@ -2213,7 +2213,7 @@ $(document).render(function(){$('[data-change-monitor]').changeMonitor()})}(wind
 ChartUtils.prototype.defaultValueColor='#b8b8b8';ChartUtils.prototype.getColor=function(index){var
 colors=['#95b753','#cc3300','#e5a91a','#3366ff','#ff0f00','#ff6600','#ff9e01','#fcd202','#f8ff01','#b0de09','#04d215','#0d8ecf','#0d52d1','#2a0cd0','#8a0ccf','#cd0d74','#754deb','#dddddd','#999999','#333333','#000000','#57032a','#ca9726','#990000','#4b0c25'],colorIndex=index%(colors.length-1);return colors[colorIndex];}
 ChartUtils.prototype.loadListValues=function($list){var result={values:[],total:0,max:0}
-$('> li',$list).each(function(){var value=parseFloat($('span',this).text());result.total+=value
+$('> li',$list).each(function(){var value=$(this).data('value')?parseFloat($(this).data('value')):parseFloat($('span',this).text());result.total+=value
 result.values.push({value:value,color:$(this).data('color')})
 result.max=Math.max(result.max,value)})
 return result;}
diff --git a/modules/cms/classes/Controller.php b/modules/cms/classes/Controller.php
index f7cb6e964..280d7f814 100644
--- a/modules/cms/classes/Controller.php
+++ b/modules/cms/classes/Controller.php
@@ -944,15 +944,17 @@ class Controller
      */
     public function renderComponent($name, $parameters = [])
     {
+        $componentVars = [];
         if ($componentObj = $this->findComponentByName($name)) {
             $componentObj->id = uniqid($name);
             $componentObj->setProperties(array_merge($componentObj->getProperties(), $parameters));
+            $componentVars = $componentObj->getVars();
             if ($result = $componentObj->onRender()) {
                 return $result;
             }
         }
 
-        return $this->renderPartial($name.'::default', $componentObj->getVars(), false);
+        return $this->renderPartial($name.'::default', $componentVars, false);
     }
 
     //