diff --git a/Adventures in Lestoria/NPC.cpp b/Adventures in Lestoria/NPC.cpp
index 05d9ee4b..d07495be 100644
--- a/Adventures in Lestoria/NPC.cpp	
+++ b/Adventures in Lestoria/NPC.cpp	
@@ -68,7 +68,6 @@ void Monster::STRATEGY::NPC(Monster&m,float fElapsedTime,std::string strategy){
 		m.F(A::TARGET_TIMER)=std::min(m.F(A::TARGET_TIMER)+fElapsedTime,ConfigFloat("Interaction Display Ease in Timer"));
 		if(game->KEY_CONFIRM.Released()&&Menu::stack.size()==0){
 			if(m.npcData.function=="Blacksmith"){
-				Tutorial::CompleteTask(TutorialTaskName::BLACKSMITH);
 				Menu::OpenMenu(MenuType::BLACKSMITH);
 				//First reset all items displayed in the blacksmith's shop (showing only our equipment.)
 				Inventory::UpdateBlacksmithInventoryLists();
diff --git a/Adventures in Lestoria/Tutorial.h b/Adventures in Lestoria/Tutorial.h
index 39b953c7..e7adbf0c 100644
--- a/Adventures in Lestoria/Tutorial.h	
+++ b/Adventures in Lestoria/Tutorial.h	
@@ -40,6 +40,7 @@ All rights reserved.
 #include "MenuComponent.h"
 #include "LoadingScreen.h"
 #include "Key.h"
+#include "Menu.h"
 
 using A=Attribute;
 
@@ -271,12 +272,14 @@ public:
 private:
     virtual inline void OnActivate()override final{
         Component<MenuComponent>(SHERMAN,"Leave Button")->SetGrayedOut(true);
+        Component<MenuComponent>(MenuType::PAUSE,"Return to Camp Button")->SetGrayedOut(true);
     }
     virtual inline bool CompleteCondition()override final{
-        return I(A::ITEM_USE_COUNT)>=1;
+        return Menu::IsMenuOpen()&&Menu::stack.back()==Menu::menus[MenuType::BLACKSMITH];
     }
     virtual inline void OnComplete()override final{
         Component<MenuComponent>(SHERMAN,"Leave Button")->SetGrayedOut(false);
+        Component<MenuComponent>(MenuType::PAUSE,"Return to Camp Button")->SetGrayedOut(false);
     }
     virtual inline void Draw()const override final{
         std::string helpText="Visit #00FFD0\"Greg\" the Blacksmith#FFFFFF to browse craftable gear.";
diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h
index f1d36d55..17fd66c2 100644
--- a/Adventures in Lestoria/Version.h	
+++ b/Adventures in Lestoria/Version.h	
@@ -39,7 +39,7 @@ All rights reserved.
 #define VERSION_MAJOR 0
 #define VERSION_MINOR 4
 #define VERSION_PATCH 4
-#define VERSION_BUILD 7905
+#define VERSION_BUILD 7906
 
 #define stringify(a) stringify_(a)
 #define stringify_(a) #a
diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe
index 2d624103..ea71a961 100644
Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ