diff --git a/forge/forge_common/net/minecraft/src/forge/oredict/OreDictionary.java b/forge/forge_common/net/minecraft/src/forge/oredict/OreDictionary.java
index 1d63c01a43..3f730f8876 100644
--- a/forge/forge_common/net/minecraft/src/forge/oredict/OreDictionary.java
+++ b/forge/forge_common/net/minecraft/src/forge/oredict/OreDictionary.java
@@ -96,16 +96,14 @@ public class OreDictionary
     public static void registerOreHandler(IOreHandler handler)
     {
         oreHandlers.add(handler);
-
-        Iterator<Map.Entry<String, Integer>> itr = oreIDs.entrySet().iterator();
-        while(itr.hasNext())
+        
+        HashMap<String, Integer> tmp = (HashMap<String, Integer>)oreIDs.clone();
+        
+        for(Map.Entry<String, Integer> entry : tmp.entrySet())
         {
-            Map.Entry<String, Integer> entry = itr.next();
-            
-            Iterator<ItemStack> ores = getOres(entry.getValue()).iterator();
-            while (ores.hasNext())
+            for(ItemStack stack : getOres(entry.getValue()))
             {
-                handler.registerOre(entry.getKey(), ores.next());
+                handler.registerOre(entry.getKey(), stack);
             }
         }
     }