Fixed problem with chart redraw not giving correct figures