BugFix: make sure that dataset is always a number
Merge branch 'origin/piechart_experimental'