Use matrixinfo variable consistently