Fixed redraw issue