Use latest core.matrix