first part taken care of
bug is fixed, charts are displaying properly.
Merge branch 'bug-ChartError' into develop