Fixed some issues with the matrix
1.5.1