diff --git a/src/gen1/Gen1GameReader.cpp b/src/gen1/Gen1GameReader.cpp
index 8cec5f7..9cd405b 100644
--- a/src/gen1/Gen1GameReader.cpp
+++ b/src/gen1/Gen1GameReader.cpp
@@ -455,6 +455,7 @@ uint8_t Gen1GameReader::addPokemon(Gen1TrainerPokemon& poke, const char* origina
             result = i;
 
             updateWholeBoxBankChecksum(getGen1BoxBankIndex(i, currentBoxIndex));
+            break;
         }   
     }
     setPokedexFlag(PokedexFlag::POKEDEX_SEEN, pokedexNumber);
diff --git a/src/gen1/Gen1PlayerPokemonStorage.cpp b/src/gen1/Gen1PlayerPokemonStorage.cpp
index 3ea1f1e..b603533 100644
--- a/src/gen1/Gen1PlayerPokemonStorage.cpp
+++ b/src/gen1/Gen1PlayerPokemonStorage.cpp
@@ -539,6 +539,7 @@ bool Gen1Box::add(Gen1TrainerPokemon& poke, const char* originalTrainerID, const
         return false;
     }
     
+    boxMeta.species_index_list[index] = poke.poke_index;
     ++boxMeta.number_of_pokemon;
 
     if(boxMeta.number_of_pokemon != getMaxNumberOfPokemon())