diff --git a/src/org/hyperic/hq/hqapi1/HQConnection.java b/src/org/hyperic/hq/hqapi1/HQConnection.java
index 4afc14b6..ea21b76c 100644
--- a/src/org/hyperic/hq/hqapi1/HQConnection.java
+++ b/src/org/hyperic/hq/hqapi1/HQConnection.java
@@ -145,16 +145,16 @@ <T> T doGet(String path, Map<String, String[]> params, Class<T> resultClass)
             uri.append("?");
         }
 
-        int idx = 0;
-        for (Iterator i = params.keySet().iterator(); i.hasNext(); idx++) {
-            String key = (String)i.next();
+        boolean append = false;
+        for (String key : params.keySet()) {
             String[] vals = params.get(key);
             for (String val : vals) {
                 if (val != null) {
-                    if (idx > 0) {
+                    if (append) {
                         uri.append("&");
                     }
                     uri.append(key).append("=").append(urlEncode(val));
+                    append = true;
                 }
             }
         }