Fix rerender