diff --git a/src/main/java/org/apache/commons/cli/config/ConfigurationParser.java b/src/main/java/org/apache/commons/cli/config/ConfigurationParser.java
index bb1e3cfc4..15daa3762 100644
--- a/src/main/java/org/apache/commons/cli/config/ConfigurationParser.java
+++ b/src/main/java/org/apache/commons/cli/config/ConfigurationParser.java
@@ -234,11 +234,10 @@ else if (builtLine.toString().matches(OPTION_REGEX_BASIC_LINE))
         buf.close();
         isr.close();
         Map<String, OptionConfiguration> options = globalConfig.getOptionConfigurations();
-        for (String name : options.keySet())
+        for (OptionConfiguration optConfig : options.values())
         {
             // any options that did not have their hasArg set will be null;
             // in which case set them to false
-            OptionConfiguration optConfig = options.get(name);
             if (optConfig.hasArg() == null)
             {
                 optConfig.setHasArg(false);