updated rerender issue