diff --git a/src/pocketmine/block/Dirt.php b/src/pocketmine/block/Dirt.php
index d6df0e7be..e97d62e1a 100644
--- a/src/pocketmine/block/Dirt.php
+++ b/src/pocketmine/block/Dirt.php
@@ -44,13 +44,20 @@ class Dirt extends Solid{
 	}
 
 	public function getName() : string{
+		if($this->meta === 1){
+			return "Coarse Dirt";
+		}
 		return "Dirt";
 	}
 
 	public function onActivate(Item $item, Player $player = null) : bool{
 		if($item->isHoe()){
 			$item->useOn($this);
-			$this->getLevel()->setBlock($this, BlockFactory::get(Block::FARMLAND, 0), true);
+			if($this->meta === 1){
+				$this->getLevel()->setBlock($this, BlockFactory::get(Block::DIRT), true);
+			}else{
+				$this->getLevel()->setBlock($this, BlockFactory::get(Block::FARMLAND), true);
+			}
 
 			return true;
 		}
diff --git a/src/pocketmine/block/Grass.php b/src/pocketmine/block/Grass.php
index e60995fee..f3b3c36a0 100644
--- a/src/pocketmine/block/Grass.php
+++ b/src/pocketmine/block/Grass.php
@@ -83,6 +83,7 @@ class Grass extends Solid{
 					$vector->z = mt_rand($this->z - 1, $this->z + 1);
 					if(
 						$this->level->getBlockIdAt($vector->x, $vector->y, $vector->z) !== Block::DIRT or
+						$this->level->getBlockDataAt($vector->x, $vector->y, $vector->z) === 1 or
 						$this->level->getFullLightAt($vector->x, $vector->y + 1, $vector->z) < 4 or
 						BlockFactory::$lightFilter[$this->level->getBlockIdAt($vector->x, $vector->y + 1, $vector->z)] >= 3
 					){