WIP fixing bug in CollectionView<T>