Quick fix. Something is wrong trying not to create the chart everytime sth changes
Merge remote-tracking branch 'origin/dev'