Fixing handling of secondary collision indexes.