Add the matrix fix from #2127