diff --git a/src/pocketmine/block/BlockFactory.php b/src/pocketmine/block/BlockFactory.php
index 3b8e97698..f14b8f6f3 100644
--- a/src/pocketmine/block/BlockFactory.php
+++ b/src/pocketmine/block/BlockFactory.php
@@ -392,8 +392,8 @@ class BlockFactory{
 
 			//TODO: find a better way to deal with this split
 			self::register(new Leaves(new BID($magicNumber >= 4 ? Block::LEAVES2 : Block::LEAVES, $magicNumber & 0x03), $name . " Leaves", $treeType));
-			self::register(new Log(new BID($magicNumber >= 4 ? Block::WOOD2 : Block::WOOD, $magicNumber & 0x03), $name . " Log", $treeType));
-			self::register(new Wood(new BID($magicNumber >= 4 ? Block::WOOD2 : Block::WOOD, ($magicNumber & 0x03) | 0b1100), $name . " Wood", $treeType));
+			self::register(new Log(new BID($magicNumber >= 4 ? Block::LOG2 : Block::LOG, $magicNumber & 0x03), $name . " Log", $treeType));
+			self::register(new Wood(new BID($magicNumber >= 4 ? Block::LOG2 : Block::LOG, ($magicNumber & 0x03) | 0b1100), $name . " Wood", $treeType));
 
 			self::register(new FenceGate(new BID($fenceGateIds[$treeType]), $treeType->getDisplayName() . " Fence Gate"));
 			self::register(new WoodenStairs(new BID($woodenStairIds[$treeType]), $treeType->getDisplayName() . " Stairs"));
diff --git a/src/pocketmine/block/BlockIds.php b/src/pocketmine/block/BlockIds.php
index acc6e4c14..93aa32c93 100644
--- a/src/pocketmine/block/BlockIds.php
+++ b/src/pocketmine/block/BlockIds.php
@@ -42,7 +42,7 @@ interface BlockIds{
 	public const GOLD_ORE = 14;
 	public const IRON_ORE = 15;
 	public const COAL_ORE = 16;
-	public const LOG = 17, WOOD = 17;
+	public const LOG = 17;
 	public const LEAVES = 18;
 	public const SPONGE = 19;
 	public const GLASS = 20;
@@ -187,7 +187,7 @@ interface BlockIds{
 	public const STAINED_CLAY = 159, STAINED_HARDENED_CLAY = 159, TERRACOTTA = 159;
 	public const STAINED_GLASS_PANE = 160;
 	public const LEAVES2 = 161;
-	public const LOG2 = 162, WOOD2 = 162;
+	public const LOG2 = 162;
 	public const ACACIA_STAIRS = 163;
 	public const DARK_OAK_STAIRS = 164;
 	public const SLIME = 165, SLIME_BLOCK = 165;
@@ -490,7 +490,7 @@ interface BlockIds{
 	public const CAMPFIRE = 464;
 	public const LAVA_CAULDRON = 465;
 	public const JIGSAW = 466;
-
+	public const WOOD = 467;
 	public const COMPOSTER = 468;
 
 }
diff --git a/src/pocketmine/item/ItemIds.php b/src/pocketmine/item/ItemIds.php
index 770911789..01c999e2d 100644
--- a/src/pocketmine/item/ItemIds.php
+++ b/src/pocketmine/item/ItemIds.php
@@ -26,7 +26,7 @@ namespace pocketmine\item;
 interface ItemIds{
 
 	public const COMPOSTER = -213;
-
+	public const WOOD = -212;
 	public const JIGSAW = -211;
 	public const LAVA_CAULDRON = -210;
 	public const CAMPFIRE = -209;
@@ -255,7 +255,7 @@ interface ItemIds{
 	public const GOLD_ORE = 14;
 	public const IRON_ORE = 15;
 	public const COAL_ORE = 16;
-	public const LOG = 17, WOOD = 17;
+	public const LOG = 17;
 	public const LEAVES = 18;
 	public const SPONGE = 19;
 	public const GLASS = 20;
@@ -400,7 +400,7 @@ interface ItemIds{
 	public const STAINED_CLAY = 159, STAINED_HARDENED_CLAY = 159, TERRACOTTA = 159;
 	public const STAINED_GLASS_PANE = 160;
 	public const LEAVES2 = 161;
-	public const LOG2 = 162, WOOD2 = 162;
+	public const LOG2 = 162;
 	public const ACACIA_STAIRS = 163;
 	public const DARK_OAK_STAIRS = 164;
 	public const SLIME = 165, SLIME_BLOCK = 165;