diff --git a/src/me/mrCookieSlime/Slimefun/api/BlockStorage.java b/src/me/mrCookieSlime/Slimefun/api/BlockStorage.java
index 0651a6ef9..020f9c256 100644
--- a/src/me/mrCookieSlime/Slimefun/api/BlockStorage.java
+++ b/src/me/mrCookieSlime/Slimefun/api/BlockStorage.java
@@ -293,8 +293,10 @@ public class BlockStorage {
 			try {
 				JSONParser parser = new JSONParser();
 				JSONObject obj = (JSONObject) parser.parse(json);
-				for (Object entry: obj.entrySet()) {
-					map.put(entry.toString(), obj.get(entry).toString());
+				for (Object entry: obj.keySet()) {
+					String key = entry.toString();
+					String value = obj.get(entry).toString();
+					map.put(key, value);
 				}
 				
 			} catch (ParseException e) {