Redraw bug fixed