bug fix for nested repeats, client performance phase II