Fixed issue with recursive rebuild of collections.