Adjust 1.9.3 syntax.
More to the matrix.