fix looparound for ts changes