Fix for pull-request. Additional changes in chart