Updated rerender issue