diff --git a/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionRegistryImpl.java b/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionRegistryImpl.java
index 0219c45e..471c5e20 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionRegistryImpl.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionRegistryImpl.java
@@ -104,9 +104,10 @@ public class FlowDefinitionRegistryImpl implements FlowDefinitionRegistry {
 	}
 
 	public void destroy() {
-		Iterator it = flowDefinitions.keySet().iterator();
+		Iterator it = flowDefinitions.values().iterator();
 		while (it.hasNext()) {
-			getFlowDefinitionHolder((String) it.next()).destroy();
+			FlowDefinitionHolder holder = (FlowDefinitionHolder) it.next();
+			holder.destroy();
 		}
 	}