diff --git a/mcMMO/com/gmail/nossr50/mcBlockListener.java b/mcMMO/com/gmail/nossr50/mcBlockListener.java
index d375d6e74..74536a52a 100644
--- a/mcMMO/com/gmail/nossr50/mcBlockListener.java
+++ b/mcMMO/com/gmail/nossr50/mcBlockListener.java
@@ -256,23 +256,23 @@ public class mcBlockListener extends BlockListener {
             int oy = blockTo.getY();
             int oz = blockTo.getZ();
 
-            if(blockTo.getTypeId() == 9 || blockTo.getTypeId() == 8){
+            if(blockTo.getTypeId() == 9 || blockTo.getTypeId() == 8)
             	return;
-            }
-
-            for (int cx = -radius; cx <= radius; cx++) {
-                for (int cy = -radius; cy <= radius; cy++) {
-                    for (int cz = -radius; cz <= radius; cz++) {
-                        Block block = world.getBlockAt(ox + cx, oy + cy, oz + cz);
-                        //If block is block
-                        if (isWater == true &&
-                        		block.getTypeId() == 13 && mcLoadProperties.clay) {
-                        	//Change
-                        	block.setTypeId(82);
-                            return;
-                        }
-                    }
-                }
+            
+            if(mcLoadProperties.clay){
+	            for (int cx = -radius; cx <= radius; cx++) {
+	                for (int cy = -radius; cy <= radius; cy++) {
+	                    for (int cz = -radius; cz <= radius; cz++) {
+	                        Block block = world.getBlockAt(ox + cx, oy + cy, oz + cz);
+	                        //If block is block
+	                        if (isWater == true){
+	                        	//Change
+	                        	block.setType(Material.CLAY);
+	                            return;
+	                        }
+	                    }
+	                }
+	            }
             }
     }
 }
\ No newline at end of file
diff --git a/mcMMO/com/gmail/nossr50/mcHerbalism.java b/mcMMO/com/gmail/nossr50/mcHerbalism.java
index 289375a31..141a27fae 100644
--- a/mcMMO/com/gmail/nossr50/mcHerbalism.java
+++ b/mcMMO/com/gmail/nossr50/mcHerbalism.java
@@ -138,7 +138,7 @@ public class mcHerbalism {
     		if(Math.random() * 1500 <= PP.getHerbalismInt()){
     			event.setCancelled(true);
     			loc.getWorld().dropItemNaturally(loc, is);
-    			//block.setType(Material.WHEAT); //Change broken block to wheat
+    			
     			block.setData((byte) 0x1); //Change it to first stage
     			
     			//Setup the bonuses