MatrixSelection fix