Fix chart redrawing issues [#48808339] [#48808865]