diff --git a/src/br/com/caelum/iogi/collections/ParametersByIndex.java b/src/br/com/caelum/iogi/collections/ParametersByIndex.java
index 8624ffd..09673b2 100644
--- a/src/br/com/caelum/iogi/collections/ParametersByIndex.java
+++ b/src/br/com/caelum/iogi/collections/ParametersByIndex.java
@@ -60,6 +60,6 @@ public Parameters at(final int index) {
 	}
 
 	public int count() {
-		return firstComponentToParameterMap.values().size();
+		return firstComponentToParameterMap.keySet().size();
 	}
-}
\ No newline at end of file
+}