Fix up logic for redraw