Fix redraw behavior