diff --git a/src/Common/com/bioxx/tfc/Food/FloraManager.java b/src/Common/com/bioxx/tfc/Food/FloraManager.java
index 82e190c7c..fa015348e 100644
--- a/src/Common/com/bioxx/tfc/Food/FloraManager.java
+++ b/src/Common/com/bioxx/tfc/Food/FloraManager.java
@@ -70,7 +70,7 @@ public FloraIndex findMatchingIndex(String input)
 		INSTANCE.addIndex(new FloraIndex("Bunchberry", TFC_Time.JULY, TFC_Time.SEPTEMBER,
 				new ItemStack(TFCItems.bunchberry,1)).setHangTime(2).setTemp(0, 18).setBioTemp(0, 20).setRain(125, 2000));
 		INSTANCE.addIndex(new FloraIndex("Cranberry", TFC_Time.SEPTEMBER, TFC_Time.NOVEMBER,
-				new ItemStack(TFCItems.cranberry,1)).setHangTime(3).setTemp(2, 18).setBioTemp(0, 25).setRain(1000, 8000));
+				new ItemStack(TFCItems.cranberry,1)).setHangTime(3).setTemp(2, 18).setBioTemp(0, 30).setRain(1000, 8000));
 		INSTANCE.addIndex(new FloraIndex("Snowberry", TFC_Time.AUGUST, TFC_Time.SEPTEMBER,
 				new ItemStack(TFCItems.snowberry,1)).setHangTime(3).setTemp(0, 18).setBioTemp(0, 20).setRain(250, 4000).setEVT(0.125f, 4));
 		INSTANCE.addIndex(new FloraIndex("Elderberry", TFC_Time.AUGUST, TFC_Time.SEPTEMBER,
@@ -78,7 +78,7 @@ public FloraIndex findMatchingIndex(String input)
 		INSTANCE.addIndex(new FloraIndex("Gooseberry", TFC_Time.MAY, TFC_Time.JULY,
 				new ItemStack(TFCItems.gooseberry,1)).setHangTime(2).setTemp(0, 28).setBioTemp(5, 25).setRain(250, 2000));
 		INSTANCE.addIndex(new FloraIndex("Cloudberry", TFC_Time.JULY, TFC_Time.AUGUST,
-				new ItemStack(TFCItems.cloudberry,1)).setHangTime(2).setTemp(0, 18).setBioTemp(0, 20).setRain(1000, 8000).setEVT(0.125f, 4));
+				new ItemStack(TFCItems.cloudberry,1)).setHangTime(2).setTemp(0, 18).setBioTemp(0, 25).setRain(1000, 8000).setEVT(0.125f, 4));
 	}
 
 }
diff --git a/src/Common/com/bioxx/tfc/WorldGen/Generators/WorldGenBerryBush.java b/src/Common/com/bioxx/tfc/WorldGen/Generators/WorldGenBerryBush.java
index a37e693fa..54d5c64e1 100644
--- a/src/Common/com/bioxx/tfc/WorldGen/Generators/WorldGenBerryBush.java
+++ b/src/Common/com/bioxx/tfc/WorldGen/Generators/WorldGenBerryBush.java
@@ -68,7 +68,9 @@ public boolean createBush(World world, Random random, int i, int j, int k, Flora
 	{
 		Block id = world.getBlock(i, j-1, k);
 		if ((world.canBlockSeeTheSky(i, j, k) || world.getBlockLightValue(i, j, k) > 8) &&
-			(TFC_Core.isSoil(id) && underBlock == Blocks.air || id == underBlock))
+			(TFC_Core.isSoil(id) && underBlock == Blocks.air ||
+				id == underBlock ||
+				TFC_Core.isGrass(underBlock) && id == TFC_Core.getTypeForSoil(underBlock)))
 		{
 			for(short h = 0; h < bushHeight && random.nextBoolean(); h++) 
 			{
diff --git a/src/Common/com/bioxx/tfc/WorldGen/Generators/WorldGenPlants.java b/src/Common/com/bioxx/tfc/WorldGen/Generators/WorldGenPlants.java
index 7a4737102..75331ab58 100644
--- a/src/Common/com/bioxx/tfc/WorldGen/Generators/WorldGenPlants.java
+++ b/src/Common/com/bioxx/tfc/WorldGen/Generators/WorldGenPlants.java
@@ -39,7 +39,7 @@ public class WorldGenPlants implements IWorldGenerator
 	private static WorldGenBerryBush snowberryGen = new WorldGenBerryBush(false, 7, 6, 1, 4);
 	private static WorldGenBerryBush elderberryGen = new WorldGenBerryBush(false, 8, 5, 2, 4);
 	private static WorldGenBerryBush gooseberryGen = new WorldGenBerryBush(false, 9, 8, 1, 4);
-	private static WorldGenBerryBush cloudberryGen = new WorldGenBerryBush(false, 10, 12, 1, 6, TFCBlocks.peat);
+	private static WorldGenBerryBush cloudberryGen = new WorldGenBerryBush(false, 10, 12, 1, 6, TFCBlocks.peatGrass);
 
 	public WorldGenPlants()
 	{
diff --git a/src/Common/com/bioxx/tfc/WorldGen/Generators/WorldGenSoilPits.java b/src/Common/com/bioxx/tfc/WorldGen/Generators/WorldGenSoilPits.java
index 2c8c6c871..fc8d3a147 100644
--- a/src/Common/com/bioxx/tfc/WorldGen/Generators/WorldGenSoilPits.java
+++ b/src/Common/com/bioxx/tfc/WorldGen/Generators/WorldGenSoilPits.java
@@ -16,8 +16,8 @@
 
 public class WorldGenSoilPits implements IWorldGenerator
 {
-	private static WorldGenBerryBush cranberryGen = new WorldGenBerryBush(false, 6, 15, 1, 6, TFCBlocks.peat);
-	private static WorldGenBerryBush cloudberryGen = new WorldGenBerryBush(false, 10, 12, 1, 6, TFCBlocks.peat);
+	private static WorldGenBerryBush cranberryGen = new WorldGenBerryBush(false, 6, 15, 1, 6, TFCBlocks.peatGrass);
+	private static WorldGenBerryBush cloudberryGen = new WorldGenBerryBush(false, 10, 12, 1, 6, TFCBlocks.peatGrass);
 
 	public WorldGenSoilPits()
 	{
@@ -40,8 +40,8 @@ public void generate(Random random, int chunkX, int chunkZ, World world,
 		{
 			if(random.nextInt(5) == 0)
 			{
-				if(!cranberryGen.generate(world, random, x, world.getTopSolidOrLiquidBlock(x, z) + 1, z))
-					cloudberryGen.generate(world, random, x, world.getTopSolidOrLiquidBlock(x, z) + 1, z);
+				if (!cloudberryGen.generate(world, random, x, world.getTopSolidOrLiquidBlock(x, z) + 1, z))
+					cranberryGen.generate(world, random, x, world.getTopSolidOrLiquidBlock(x, z) + 1, z);
 			}
 		}
 	}