Fixed redrawing bug