No longer in an if block so it is available during redraw.