diff --git a/1.4/Source/Comps/CompBodyAnimator.cs b/1.4/Source/Comps/CompBodyAnimator.cs
index 5d355a6..d77a430 100644
--- a/1.4/Source/Comps/CompBodyAnimator.cs
+++ b/1.4/Source/Comps/CompBodyAnimator.cs
@@ -465,7 +465,9 @@ namespace Rimworld_Animations {
             Scribe_Values.Look(ref headFacing, "RJWAnimations-headFacing");
             Scribe_Values.Look(ref headFacing, "RJWAnimations-bodyFacing");
 
-            Scribe_Values.Look(ref quiver, "RJWAnimations-orgasmQuiver");                             
+            Scribe_Values.Look(ref quiver, "RJWAnimations-orgasmQuiver");
+
+            Scribe_Values.Look(ref Animating, "RJWAnimations-Animating");
         }
 
         public void shiftActorPositionAndRestartAnimation() {
diff --git a/1.4/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs b/1.4/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs
index 260d924..00227c4 100644
--- a/1.4/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs
+++ b/1.4/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs
@@ -109,6 +109,7 @@ namespace Rimworld_Animations {
 					int animTicks = anim.animationTimeTicks - (fastAnimForQuickie ? anim.animationStages[0].playTimeTicks : 0);
 					(pawnsToAnimate[i].jobs.curDriver as JobDriver_Sex).ticks_left = animTicks;
 					(pawnsToAnimate[i].jobs.curDriver as JobDriver_Sex).sex_ticks = animTicks;
+					(pawnsToAnimate[i].jobs.curDriver as JobDriver_Sex).orgasmStartTick = animTicks;
 					(pawnsToAnimate[i].jobs.curDriver as JobDriver_Sex).duration = animTicks;
 
 
diff --git a/Patch_SexToysMasturbation/Source/Patches/HarmonyPatch_JobDriver_SexBaseInitiator.cs b/Patch_SexToysMasturbation/Source/Patches/HarmonyPatch_JobDriver_SexBaseInitiator.cs
index ef3f4fb..9f29203 100644
--- a/Patch_SexToysMasturbation/Source/Patches/HarmonyPatch_JobDriver_SexBaseInitiator.cs
+++ b/Patch_SexToysMasturbation/Source/Patches/HarmonyPatch_JobDriver_SexBaseInitiator.cs
@@ -59,6 +59,7 @@ namespace Patch_SexToysMasturbation
 
                 (pawn.jobs.curDriver as JobDriver_Sex).ticks_left = anim.animationTimeTicks;
                 (pawn.jobs.curDriver as JobDriver_Sex).sex_ticks = anim.animationTimeTicks;
+                (pawn.jobs.curDriver as JobDriver_Sex).orgasmStartTick = anim.animationTimeTicks;
                 (pawn.jobs.curDriver as JobDriver_Sex).duration = anim.animationTimeTicks;
             }
             else