diff --git a/src/Work/CreateProgramWork.ts b/src/Work/CreateProgramWork.ts
index 56a25d9c7..0b087d00e 100644
--- a/src/Work/CreateProgramWork.ts
+++ b/src/Work/CreateProgramWork.ts
@@ -64,8 +64,8 @@ export class CreateProgramWork extends Work {
     skillMult *= focusBonus;
     //Skill multiplier directly applied to "time worked"
     this.cyclesWorked += cycles;
-    this.unitRate = CONSTANTS.MilliPerCycle * cycles * skillMult;
-    this.unitCompleted += this.unitRate;
+    this.unitRate = CONSTANTS.MilliPerCycle * skillMult;
+    this.unitCompleted += this.unitRate * cycles;
 
     if (this.unitCompleted >= this.unitNeeded()) {
       return true;
diff --git a/src/Work/GraftingWork.tsx b/src/Work/GraftingWork.tsx
index ddf910a47..b9811e18b 100644
--- a/src/Work/GraftingWork.tsx
+++ b/src/Work/GraftingWork.tsx
@@ -49,8 +49,8 @@ export class GraftingWork extends Work {
   process(cycles: number): boolean {
     const focusBonus = Player.focusPenalty();
     this.cyclesWorked += cycles;
-    this.unitRate = CONSTANTS.MilliPerCycle * cycles * graftingIntBonus() * focusBonus;
-    this.unitCompleted += this.unitRate;
+    this.unitRate = CONSTANTS.MilliPerCycle * graftingIntBonus() * focusBonus;
+    this.unitCompleted += this.unitRate * cycles;
     return this.unitCompleted >= this.unitNeeded();
   }