diff --git a/1.4/Assemblies/RJW_Menstruation.dll b/1.4/Assemblies/RJW_Menstruation.dll
index 23a7e14..0215954 100644
Binary files a/1.4/Assemblies/RJW_Menstruation.dll and b/1.4/Assemblies/RJW_Menstruation.dll differ
diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs
index cf59be0..070c6ef 100644
--- a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs
+++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs
@@ -673,12 +673,12 @@ namespace RJW_Menstruation
                 if (Pregnancy != null && curStage != Stage.Pregnant)
                 {
                     Log.Warning($"{Pawn}'s womb has a pregnancy, but was not in the pregnant stage");
-                    curStage = Stage.Pregnant;
+                    GoNextStage(Stage.Pregnant);
                 }
 
                 BeforeSimulator();
                 
-                if (pregnancy == null && (Pawn.health.capacities.GetLevel(xxx.reproduction) <= 0 || EggHealth <= 0 || Pawn.SterileGenes())) curStage = Stage.Infertile;
+                if (pregnancy == null && (Pawn.health.capacities.GetLevel(xxx.reproduction) <= 0 || EggHealth <= 0 || Pawn.SterileGenes())) GoNextStage(Stage.Infertile);
                 switch (curStage)
                 {
                     case Stage.Follicular:
@@ -1799,7 +1799,7 @@ namespace RJW_Menstruation
                     return (int)(Props.recoveryIntervalDays * 24 * Rand.Range(0.95f, 1.05f));
                 case Stage.Pregnant:
                     return (int)MenstruationUtility.GestationHours(pregnancy);
-                default:    // Often unused
+                default:
                     return 1;
             }
         }
diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PeriodicOvulator.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PeriodicOvulator.cs
index 2daf3a5..b3fa2ac 100644
--- a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PeriodicOvulator.cs
+++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PeriodicOvulator.cs
@@ -33,7 +33,7 @@ namespace RJW_Menstruation
                 // Make the cutoff halfway into cycle, just to be sure there isn't a double-cycle the first time
                 if ((curStage == Stage.Follicular || curStage == Stage.Luteal || curStage == Stage.Bleeding)
                     && (averageCycleIntervalHours - hoursToNextCycle) / 2 >= 24 * (Props.follicularIntervalDays + Props.lutealIntervalDays) / cycleSpeed)
-                    curStage = Stage.Anestrus;
+                    GoNextStage(Stage.Anestrus);
             }
         }