fixed more redraw issues