This is a patch so that the matrices in discrete mode takes the real number of request. This should not be final because it is hardly understandable.
undo some stuff I did for debugging.