Fix initial drawing - #309 #336
Fix sample for bar chart