diff --git a/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp
index 735ed2dc..c43a1433 100644
--- a/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp
@@ -315,15 +315,19 @@ bool IUIScene_CraftingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat)
 						case Tile::workBench_Id:		m_pPlayer->awardStat(GenericStats::buildWorkbench(),		GenericStats::param_buildWorkbench());		break;
 						case Item::pickAxe_wood_Id:		m_pPlayer->awardStat(GenericStats::buildPickaxe(),			GenericStats::param_buildPickaxe());		break;
 						case Tile::furnace_Id:			m_pPlayer->awardStat(GenericStats::buildFurnace(),			GenericStats::param_buildFurnace());		break;
-						case Item::hoe_wood_Id:			m_pPlayer->awardStat(GenericStats::buildHoe(),				GenericStats::param_buildHoe());			break;
+						//case Item::hoe_wood_Id:			m_pPlayer->awardStat(GenericStats::buildHoe(),				GenericStats::param_buildHoe());			break;
 						case Item::bread_Id:			m_pPlayer->awardStat(GenericStats::makeBread(),				GenericStats::param_makeBread());			break;
 						case Item::cake_Id:				m_pPlayer->awardStat(GenericStats::bakeCake(),				GenericStats::param_bakeCake());			break;
 						case Item::pickAxe_stone_Id:	m_pPlayer->awardStat(GenericStats::buildBetterPickaxe(),	GenericStats::param_buildBetterPickaxe());	break;
-						case Item::sword_wood_Id:		m_pPlayer->awardStat(GenericStats::buildSword(),			GenericStats::param_buildSword());			break;
+						//case Item::sword_wood_Id:		m_pPlayer->awardStat(GenericStats::buildSword(),			GenericStats::param_buildSword());			break;
 						case Tile::dispenser_Id:		m_pPlayer->awardStat(GenericStats::dispenseWithThis(),		GenericStats::param_dispenseWithThis());	break;
 						case Tile::enchantTable_Id:		m_pPlayer->awardStat(GenericStats::enchantments(),			GenericStats::param_enchantments());		break;
 						case Tile::bookshelf_Id:		m_pPlayer->awardStat(GenericStats::bookcase(),				GenericStats::param_bookcase());			break;
 						}
+						switch (pTempItemInst->getItem()->getBaseItemType()) {
+						case Item::eBaseItemType_hoe:		m_pPlayer->awardStat(GenericStats::buildHoe(), GenericStats::param_buildHoe());			break;
+						case Item::eBaseItemType_sword:		m_pPlayer->awardStat(GenericStats::buildSword(), GenericStats::param_buildSword());		break;
+						}
 
 						// We've used some ingredients from our inventory, so update the recipes we can make
 						CheckRecipesAvailable();
diff --git a/Minecraft.World/ResultSlot.cpp b/Minecraft.World/ResultSlot.cpp
index 89a07ed1..bed4d2d8 100644
--- a/Minecraft.World/ResultSlot.cpp
+++ b/Minecraft.World/ResultSlot.cpp
@@ -38,16 +38,17 @@ void ResultSlot::checkTakeAchievements(shared_ptr<ItemInstance> carried)
 	carried->onCraftedBy(player->level, dynamic_pointer_cast<Player>( player->shared_from_this() ), removeCount);
 	removeCount = 0;
 
-	if (carried->id == Tile::workBench_Id)				player->awardStat(GenericStats::buildWorkbench(),		GenericStats::param_buildWorkbench());
-	else if (carried->id == Item::pickAxe_wood_Id)		player->awardStat(GenericStats::buildPickaxe(),			GenericStats::param_buildPickaxe());
-	else if (carried->id == Tile::furnace_Id)			player->awardStat(GenericStats::buildFurnace(),			GenericStats::param_buildFurnace());
-	else if (carried->id == Item::hoe_wood_Id)			player->awardStat(GenericStats::buildHoe(),				GenericStats::param_buildHoe());
-	else if (carried->id == Item::bread_Id)				player->awardStat(GenericStats::makeBread(),			GenericStats::param_makeBread());
-	else if (carried->id == Item::cake_Id)				player->awardStat(GenericStats::bakeCake(),				GenericStats::param_bakeCake());
-	else if (carried->id == Item::pickAxe_stone_Id)		player->awardStat(GenericStats::buildBetterPickaxe(),	GenericStats::param_buildBetterPickaxe());
-	else if (carried->id == Item::sword_wood_Id)		player->awardStat(GenericStats::buildSword(),			GenericStats::param_buildSword());
-	//else if (carried->id == Tile::enchantTable_Id)	player->awardStat(GenericStats::enchantments(),			GenericStats::param_achievement(eAward_));
-	else if (carried->id == Tile::bookshelf_Id)			player->awardStat(GenericStats::bookcase(),				GenericStats::param_bookcase());
+	if (carried->id == Tile::workBench_Id)												player->awardStat(GenericStats::buildWorkbench(),		GenericStats::param_buildWorkbench());
+	else if (carried->id == Item::pickAxe_wood_Id)										player->awardStat(GenericStats::buildPickaxe(),			GenericStats::param_buildPickaxe());
+	else if (carried->id == Tile::furnace_Id)											player->awardStat(GenericStats::buildFurnace(),			GenericStats::param_buildFurnace());
+	else if (carried->getItem()->getBaseItemType() == Item::eBaseItemType_hoe)			player->awardStat(GenericStats::buildHoe(),				GenericStats::param_buildHoe());
+	else if (carried->id == Item::bread_Id)												player->awardStat(GenericStats::makeBread(),			GenericStats::param_makeBread());
+	else if (carried->id == Item::cake_Id)												player->awardStat(GenericStats::bakeCake(),				GenericStats::param_bakeCake());
+	else if (carried->id == Item::pickAxe_stone_Id)										player->awardStat(GenericStats::buildBetterPickaxe(),	GenericStats::param_buildBetterPickaxe());
+	// The description is technically wrong but that's accurate
+	else if (carried->getItem()->getBaseItemType() == Item::eBaseItemType_sword)		player->awardStat(GenericStats::buildSword(),			GenericStats::param_buildSword());
+	//else if (carried->id == Tile::enchantTable_Id)									player->awardStat(GenericStats::enchantments(),			GenericStats::param_achievement(eAward_));
+	else if (carried->id == Tile::bookshelf_Id)											player->awardStat(GenericStats::bookcase(),				GenericStats::param_bookcase());
 
 	// 4J : WESTY : Added new acheivements. 
 	else if (carried->id == Tile::dispenser_Id) player->awardStat(GenericStats::dispenseWithThis(), GenericStats::param_dispenseWithThis());