Fixed Bug on Grid rerender