temporary fix for rerender