diff --git a/README.md b/README.md
index 75297b3a..e963eeb9 100644
--- a/README.md
+++ b/README.md
@@ -262,7 +262,8 @@ and more!
 
 Known Bugs
 ====
-- Itemfinder fails at its one job of finding items.
+- Trying to teach a TM/HM twice in a row may cause a game crash, so it's advised to save when teaching moves.
+- Trying to Surf from the overworld on Cycling Road has an invisible textbox stopping you, but just pressing A again lets you regain control.
 
 Evolution Methods for new Pokemon
 ====
diff --git a/main.asm b/main.asm
index aa065b11..2cd8fb52 100644
--- a/main.asm
+++ b/main.asm
@@ -333,7 +333,6 @@ SECTION "Itemfinder 1", ROMX
 
 INCLUDE "engine/movie/credits.asm"
 INCLUDE "engine/pokemon/status_ailments.asm"
-INCLUDE "engine/items/itemfinder.asm"
 
 
 SECTION "Vending Machine", ROMX
@@ -344,6 +343,7 @@ INCLUDE "gfx/fishing.asm"
 
 SECTION "Itemfinder 2", ROMX
 
+INCLUDE "engine/items/itemfinder.asm"
 INCLUDE "engine/menus/league_pc.asm"
 INCLUDE "engine/events/hidden_items.asm"