diff --git a/clients/cli/utils.c b/clients/cli/utils.c
index 9b513f5a08..d6f804ca49 100644
--- a/clients/cli/utils.c
+++ b/clients/cli/utils.c
@@ -700,9 +700,9 @@ parse_output_fields (const char *fields_str,
 							break;
 						}
 					}
+					if (found)
+						break;
 				}
-				if (found)
-					break;
 			}
 			if (found) {
 				/* Add index to array, and field name (or NULL) to group_fields array */