Fixed redraw/refresh issue