Avoid use of Matrix<WeakRef> -> SparseStorage
fix occurance of internal API