Fixes problem with collection index types