Fixed rerender loopback issue