if (LoopVariable == TableNameInstance\r
|| (TableNameInstance == (UINTN)-1)) {\r
for (ColumnLoop = 1, ColumnPointer = TempLine; ColumnLoop < ColumnIndex && ColumnPointer != NULL && *ColumnPointer != CHAR_NULL; ColumnLoop++) {\r
- ColumnPointer = StrStr (ColumnPointer, L",");\r
+ ColumnPointer = StrStr (ColumnPointer, L",\"");\r
if (ColumnPointer != NULL && *ColumnPointer != CHAR_NULL){\r
ColumnPointer++;\r
}\r
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellLevel2HiiHandle, L"Column Index");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
- TempSpot = StrStr (ColumnPointer, L",");\r
+ TempSpot = StrStr (ColumnPointer, L",\"");\r
if (TempSpot != NULL) {\r
*TempSpot = CHAR_NULL;\r
}\r