Fix for nested collections