Fix for change tracking of collections