Fix matrix (again)