diff --git a/src/daycare.c b/src/daycare.c
index a438c8e857..fd6ed3a509 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -548,7 +548,12 @@ static void InheritIVs(struct Pokemon *egg, struct DayCare *daycare)
     {
         // Randomly pick an IV from the available list and stop from being chosen again.
         selectedIvs[i] = availableIVs[Random() % (NUM_STATS - i)];
-        RemoveIVIndexFromList(availableIVs, i);
+        // BUG: Instead of removing the IV that was just picked (like in RS and FRLG), this
+        // removes position 0 (HP) then position 1 (DEF), then position 2. This is why HP and DEF
+        // have a lower chance to be inherited in Emerald and why the IV picked for inheritance can
+        // be repeated. Uncomment the inline comment and remove the existing expression to get the
+        // intended behavior and  to match the other Gen 3 games. 
+        RemoveIVIndexFromList(availableIVs, i /*selectedIvs[i]*/);
     }
 
     // Determine which parent each of the selected IVs should inherit from.