Fixed core.Control while rerendering