Rerender Fix