Fix IndexOutOfBoundException when there is a coma inside a matrix name