Fix bug with charts in Fx
Merge branch 'bugFix' into develop
Fix merge conflicts