Fixes problem with collection index types
Merge pull request #1409 from systay/collection-index-type

Fixes problem with collection index types