Fixed PieChart and DataClass