Fix redraw issue