Fixed redrawing