Redraw fix