Updated code to ensure indexing on values when they are in return value fields is correct [B: 1765]

Updated code to ensure indexing on values when they are in return value fields is correct [B: 1765] #1730