fixes errors with older users data
Merge branch 'chart-fix'