Fix redraw problem