Fix barChart bug
Merge branch 'barChart' into develop