Merge pull request #1559 from posgarou/bugfix/chart_undefined_in_core_helper

Fix mistaken variable assignment in core files