fix rerender problem
fix rerender problem