TRQ-2712 fixed an eternal loop.