diff --git a/scripts/effects/beast_roll.lua b/scripts/effects/beast_roll.lua
index 3840a1476e2..93e8fbdbd93 100644
--- a/scripts/effects/beast_roll.lua
+++ b/scripts/effects/beast_roll.lua
@@ -15,6 +15,7 @@ end
 effectObject.onEffectLose = function(target, effect)
     target:delPetMod(xi.mod.ATTP, effect:getPower())
     target:delPetMod(xi.mod.RATTP, effect:getPower())
+    xi.job_utils.corsair.onRollEffectLose(target, effect)
 end
 
 return effectObject
diff --git a/scripts/effects/blitzers_roll.lua b/scripts/effects/blitzers_roll.lua
index 549ef9c75e5..bf984f665e1 100644
--- a/scripts/effects/blitzers_roll.lua
+++ b/scripts/effects/blitzers_roll.lua
@@ -5,14 +5,13 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    target:addMod(xi.mod.DELAYP, effect:getPower())
+    effect:addMod(xi.mod.DELAYP, effect:getPower())
 end
 
 effectObject.onEffectTick = function(target, effect)
 end
 
 effectObject.onEffectLose = function(target, effect)
-    target:delMod(xi.mod.DELAYP, effect:getPower())
     xi.job_utils.corsair.onRollEffectLose(target, effect)
 end
 
diff --git a/scripts/effects/casters_roll.lua b/scripts/effects/casters_roll.lua
index a608e801d27..536e2e62b1e 100644
--- a/scripts/effects/casters_roll.lua
+++ b/scripts/effects/casters_roll.lua
@@ -5,14 +5,13 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    target:addMod(xi.mod.FASTCAST, effect:getPower())
+    effect:addMod(xi.mod.FASTCAST, effect:getPower())
 end
 
 effectObject.onEffectTick = function(target, effect)
 end
 
 effectObject.onEffectLose = function(target, effect)
-    target:delMod(xi.mod.FASTCAST, effect:getPower())
     xi.job_utils.corsair.onRollEffectLose(target, effect)
 end
 
diff --git a/scripts/effects/chaos_roll.lua b/scripts/effects/chaos_roll.lua
index 937a836ece4..133575da542 100644
--- a/scripts/effects/chaos_roll.lua
+++ b/scripts/effects/chaos_roll.lua
@@ -5,16 +5,15 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    target:addMod(xi.mod.ATTP, effect:getPower())
-    target:addMod(xi.mod.RATTP, effect:getPower())
+    effect:addMod(xi.mod.ATTP, effect:getPower())
+    effect:addMod(xi.mod.RATTP, effect:getPower())
 end
 
 effectObject.onEffectTick = function(target, effect)
 end
 
 effectObject.onEffectLose = function(target, effect)
-    target:delMod(xi.mod.ATTP, effect:getPower())
-    target:delMod(xi.mod.RATTP, effect:getPower())
+    xi.job_utils.corsair.onRollEffectLose(target, effect)
 end
 
 return effectObject
diff --git a/scripts/effects/choral_roll.lua b/scripts/effects/choral_roll.lua
index c47ce1f7265..b065b556eca 100644
--- a/scripts/effects/choral_roll.lua
+++ b/scripts/effects/choral_roll.lua
@@ -5,14 +5,13 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    target:addMod(xi.mod.SPELLINTERRUPT, effect:getPower())
+    effect:addMod(xi.mod.SPELLINTERRUPT, effect:getPower())
 end
 
 effectObject.onEffectTick = function(target, effect)
 end
 
 effectObject.onEffectLose = function(target, effect)
-    target:delMod(xi.mod.SPELLINTERRUPT, effect:getPower())
     xi.job_utils.corsair.onRollEffectLose(target, effect)
 end
 
diff --git a/scripts/effects/corsairs_roll.lua b/scripts/effects/corsairs_roll.lua
index 4348be028bf..b2d8d2af632 100644
--- a/scripts/effects/corsairs_roll.lua
+++ b/scripts/effects/corsairs_roll.lua
@@ -5,8 +5,8 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    target:addMod(xi.mod.EXP_BONUS, effect:getPower())
-    target:addMod(xi.mod.CAPACITY_BONUS, effect:getPower())
+    effect:addMod(xi.mod.EXP_BONUS, effect:getPower())
+    effect:addMod(xi.mod.CAPACITY_BONUS, effect:getPower())
     -- TODO: Exemplar Points (Not Implemented)
 end
 
@@ -14,8 +14,6 @@ effectObject.onEffectTick = function(target, effect)
 end
 
 effectObject.onEffectLose = function(target, effect)
-    target:delMod(xi.mod.EXP_BONUS, effect:getPower())
-    target:delMod(xi.mod.CAPACITY_BONUS, effect:getPower())
     -- TODO: Exemplar Points (Not Implemented)
     xi.job_utils.corsair.onRollEffectLose(target, effect)
 end
diff --git a/scripts/effects/coursers_roll.lua b/scripts/effects/coursers_roll.lua
index e05aa109ad6..0a837e30a7d 100644
--- a/scripts/effects/coursers_roll.lua
+++ b/scripts/effects/coursers_roll.lua
@@ -6,14 +6,13 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    -- target:addMod(xi.mod.SNAPSHOT, effect:getPower())
+    -- effect:addMod(xi.mod.SNAPSHOT, effect:getPower())
 end
 
 effectObject.onEffectTick = function(target, effect)
 end
 
 effectObject.onEffectLose = function(target, effect)
-    -- target:delMod(xi.mod.SNAPSHOT, effect:getPower())
     xi.job_utils.corsair.onRollEffectLose(target, effect)
 end
 
diff --git a/scripts/effects/dancers_roll.lua b/scripts/effects/dancers_roll.lua
index 4757f3e518b..d6046ca21b1 100644
--- a/scripts/effects/dancers_roll.lua
+++ b/scripts/effects/dancers_roll.lua
@@ -5,14 +5,13 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    target:addMod(xi.mod.REGEN, effect:getPower())
+    effect:addMod(xi.mod.REGEN, effect:getPower())
 end
 
 effectObject.onEffectTick = function(target, effect)
 end
 
 effectObject.onEffectLose = function(target, effect)
-    target:delMod(xi.mod.REGEN, effect:getPower())
     xi.job_utils.corsair.onRollEffectLose(target, effect)
 end
 
diff --git a/scripts/effects/evokers_roll.lua b/scripts/effects/evokers_roll.lua
index f22c731528c..1b186353760 100644
--- a/scripts/effects/evokers_roll.lua
+++ b/scripts/effects/evokers_roll.lua
@@ -5,14 +5,13 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    target:addMod(xi.mod.REFRESH, effect:getPower())
+    effect:addMod(xi.mod.REFRESH, effect:getPower())
 end
 
 effectObject.onEffectTick = function(target, effect)
 end
 
 effectObject.onEffectLose = function(target, effect)
-    target:delMod(xi.mod.REFRESH, effect:getPower())
     xi.job_utils.corsair.onRollEffectLose(target, effect)
 end
 
diff --git a/scripts/effects/fighters_roll.lua b/scripts/effects/fighters_roll.lua
index 065b3cfef41..57ad3e62c1a 100644
--- a/scripts/effects/fighters_roll.lua
+++ b/scripts/effects/fighters_roll.lua
@@ -5,14 +5,13 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    target:addMod(xi.mod.DOUBLE_ATTACK, effect:getPower())
+    effect:addMod(xi.mod.DOUBLE_ATTACK, effect:getPower())
 end
 
 effectObject.onEffectTick = function(target, effect)
 end
 
 effectObject.onEffectLose = function(target, effect)
-    target:delMod(xi.mod.DOUBLE_ATTACK, effect:getPower())
     xi.job_utils.corsair.onRollEffectLose(target, effect)
 end
 
diff --git a/scripts/effects/gallants_roll.lua b/scripts/effects/gallants_roll.lua
index 70c647376a0..e7523f2a59a 100644
--- a/scripts/effects/gallants_roll.lua
+++ b/scripts/effects/gallants_roll.lua
@@ -5,14 +5,13 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    target:addMod(xi.mod.DMG, -effect:getPower())
+    effect:addMod(xi.mod.DMG, -effect:getPower())
 end
 
 effectObject.onEffectTick = function(target, effect)
 end
 
 effectObject.onEffectLose = function(target, effect)
-    target:delMod(xi.mod.DMG, -effect:getPower())
     xi.job_utils.corsair.onRollEffectLose(target, effect)
 end
 
diff --git a/scripts/effects/healers_roll.lua b/scripts/effects/healers_roll.lua
index aa8afe410cb..1dac4368301 100644
--- a/scripts/effects/healers_roll.lua
+++ b/scripts/effects/healers_roll.lua
@@ -5,14 +5,13 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    target:addMod(xi.mod.CURE_POTENCY_RCVD, effect:getPower())
+    effect:addMod(xi.mod.CURE_POTENCY_RCVD, effect:getPower())
 end
 
 effectObject.onEffectTick = function(target, effect)
 end
 
 effectObject.onEffectLose = function(target, effect)
-    target:delMod(xi.mod.CURE_POTENCY_RCVD, effect:getPower())
     xi.job_utils.corsair.onRollEffectLose(target, effect)
 end
 
diff --git a/scripts/effects/hunters_roll.lua b/scripts/effects/hunters_roll.lua
index 0474d68b85f..236976b2f84 100644
--- a/scripts/effects/hunters_roll.lua
+++ b/scripts/effects/hunters_roll.lua
@@ -5,16 +5,14 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    target:addMod(xi.mod.ACC, effect:getPower())
-    target:addMod(xi.mod.RACC, effect:getPower())
+    effect:addMod(xi.mod.ACC, effect:getPower())
+    effect:addMod(xi.mod.RACC, effect:getPower())
 end
 
 effectObject.onEffectTick = function(target, effect)
 end
 
 effectObject.onEffectLose = function(target, effect)
-    target:delMod(xi.mod.ACC, effect:getPower())
-    target:delMod(xi.mod.RACC, effect:getPower())
     xi.job_utils.corsair.onRollEffectLose(target, effect)
 end
 
diff --git a/scripts/effects/maguss_roll.lua b/scripts/effects/maguss_roll.lua
index 2dc896248b0..0beb9b2fd41 100644
--- a/scripts/effects/maguss_roll.lua
+++ b/scripts/effects/maguss_roll.lua
@@ -5,14 +5,13 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    target:addMod(xi.mod.MDEF, effect:getPower())
+    effect:addMod(xi.mod.MDEF, effect:getPower())
 end
 
 effectObject.onEffectTick = function(target, effect)
 end
 
 effectObject.onEffectLose = function(target, effect)
-    target:delMod(xi.mod.MDEF, effect:getPower())
     xi.job_utils.corsair.onRollEffectLose(target, effect)
 end
 
diff --git a/scripts/effects/misers_roll.lua b/scripts/effects/misers_roll.lua
index 3083696888a..60e1df16735 100644
--- a/scripts/effects/misers_roll.lua
+++ b/scripts/effects/misers_roll.lua
@@ -5,14 +5,13 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    target:addMod(xi.mod.SAVETP, effect:getPower())
+    effect:addMod(xi.mod.SAVETP, effect:getPower())
 end
 
 effectObject.onEffectTick = function(target, effect)
 end
 
 effectObject.onEffectLose = function(target, effect)
-    target:delMod(xi.mod.SAVETP, effect:getPower())
     xi.job_utils.corsair.onRollEffectLose(target, effect)
 end
 
diff --git a/scripts/effects/monks_roll.lua b/scripts/effects/monks_roll.lua
index 1e9c016c10e..1eafc0576a3 100644
--- a/scripts/effects/monks_roll.lua
+++ b/scripts/effects/monks_roll.lua
@@ -5,14 +5,13 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    target:addMod(xi.mod.SUBTLE_BLOW, effect:getPower())
+    effect:addMod(xi.mod.SUBTLE_BLOW, effect:getPower())
 end
 
 effectObject.onEffectTick = function(target, effect)
 end
 
 effectObject.onEffectLose = function(target, effect)
-    target:delMod(xi.mod.SUBTLE_BLOW, effect:getPower())
     xi.job_utils.corsair.onRollEffectLose(target, effect)
 end
 
diff --git a/scripts/effects/naturalists_roll.lua b/scripts/effects/naturalists_roll.lua
index 41f9be40c6d..0a053247e66 100644
--- a/scripts/effects/naturalists_roll.lua
+++ b/scripts/effects/naturalists_roll.lua
@@ -5,14 +5,13 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    target:addMod(xi.mod.ENH_MAGIC_DURATION, effect:getPower())
+    effect:addMod(xi.mod.ENH_MAGIC_DURATION, effect:getPower())
 end
 
 effectObject.onEffectTick = function(target, effect)
 end
 
 effectObject.onEffectLose = function(target, effect)
-    target:delMod(xi.mod.ENH_MAGIC_DURATION, effect:getPower())
     xi.job_utils.corsair.onRollEffectLose(target, effect)
 end
 
diff --git a/scripts/effects/ninja_roll.lua b/scripts/effects/ninja_roll.lua
index 33d806b04cd..e3d6dfe4ce6 100644
--- a/scripts/effects/ninja_roll.lua
+++ b/scripts/effects/ninja_roll.lua
@@ -5,14 +5,13 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    target:addMod(xi.mod.EVA, effect:getPower())
+    effect:addMod(xi.mod.EVA, effect:getPower())
 end
 
 effectObject.onEffectTick = function(target, effect)
 end
 
 effectObject.onEffectLose = function(target, effect)
-    target:delMod(xi.mod.EVA, effect:getPower())
     xi.job_utils.corsair.onRollEffectLose(target, effect)
 end
 
diff --git a/scripts/effects/rogues_roll.lua b/scripts/effects/rogues_roll.lua
index eeb54c109df..e7dcfd08e93 100644
--- a/scripts/effects/rogues_roll.lua
+++ b/scripts/effects/rogues_roll.lua
@@ -5,14 +5,13 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    target:addMod(xi.mod.CRITHITRATE, effect:getPower())
+    effect:addMod(xi.mod.CRITHITRATE, effect:getPower())
 end
 
 effectObject.onEffectTick = function(target, effect)
 end
 
 effectObject.onEffectLose = function(target, effect)
-    target:delMod(xi.mod.CRITHITRATE, effect:getPower())
     xi.job_utils.corsair.onRollEffectLose(target, effect)
 end
 
diff --git a/scripts/effects/runeists_roll.lua b/scripts/effects/runeists_roll.lua
index e741297f622..e2de1d6dcdb 100644
--- a/scripts/effects/runeists_roll.lua
+++ b/scripts/effects/runeists_roll.lua
@@ -5,14 +5,13 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    target:addMod(xi.mod.MEVA, effect:getPower())
+    effect:addMod(xi.mod.MEVA, effect:getPower())
 end
 
 effectObject.onEffectTick = function(target, effect)
 end
 
 effectObject.onEffectLose = function(target, effect)
-    target:delMod(xi.mod.MEVA, effect:getPower())
     xi.job_utils.corsair.onRollEffectLose(target, effect)
 end
 
diff --git a/scripts/effects/samurai_roll.lua b/scripts/effects/samurai_roll.lua
index 9b1f45de2bc..b162e6b79e7 100644
--- a/scripts/effects/samurai_roll.lua
+++ b/scripts/effects/samurai_roll.lua
@@ -5,14 +5,13 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    target:addMod(xi.mod.STORETP, effect:getPower())
+    effect:addMod(xi.mod.STORETP, effect:getPower())
 end
 
 effectObject.onEffectTick = function(target, effect)
 end
 
 effectObject.onEffectLose = function(target, effect)
-    target:delMod(xi.mod.STORETP, effect:getPower())
     xi.job_utils.corsair.onRollEffectLose(target, effect)
 end
 
diff --git a/scripts/effects/scholars_roll.lua b/scripts/effects/scholars_roll.lua
index 8060622bb60..6b521fea21a 100644
--- a/scripts/effects/scholars_roll.lua
+++ b/scripts/effects/scholars_roll.lua
@@ -5,14 +5,13 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    target:addMod(xi.mod.CONSERVE_MP, effect:getPower())
+    effect:addMod(xi.mod.CONSERVE_MP, effect:getPower())
 end
 
 effectObject.onEffectTick = function(target, effect)
 end
 
 effectObject.onEffectLose = function(target, effect)
-    target:delMod(xi.mod.CONSERVE_MP, effect:getPower())
     xi.job_utils.corsair.onRollEffectLose(target, effect)
 end
 
diff --git a/scripts/effects/tacticians_roll.lua b/scripts/effects/tacticians_roll.lua
index 09a65fe0149..8ac2c16eeef 100644
--- a/scripts/effects/tacticians_roll.lua
+++ b/scripts/effects/tacticians_roll.lua
@@ -5,14 +5,13 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    target:addMod(xi.mod.REGAIN, effect:getPower())
+    effect:addMod(xi.mod.REGAIN, effect:getPower())
 end
 
 effectObject.onEffectTick = function(target, effect)
 end
 
 effectObject.onEffectLose = function(target, effect)
-    target:delMod(xi.mod.REGAIN, effect:getPower())
     xi.job_utils.corsair.onRollEffectLose(target, effect)
 end
 
diff --git a/scripts/effects/warlocks_roll.lua b/scripts/effects/warlocks_roll.lua
index 36f760b6dbc..10d93eb1ae1 100644
--- a/scripts/effects/warlocks_roll.lua
+++ b/scripts/effects/warlocks_roll.lua
@@ -5,14 +5,14 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    target:addMod(xi.mod.MACC, effect:getPower())
+    effect:addMod(xi.mod.MACC, effect:getPower())
 end
 
 effectObject.onEffectTick = function(target, effect)
 end
 
 effectObject.onEffectLose = function(target, effect)
-    target:delMod(xi.mod.MACC, effect:getPower())
+    xi.job_utils.corsair.onRollEffectLose(target, effect)
 end
 
 return effectObject
diff --git a/scripts/effects/wizards_roll.lua b/scripts/effects/wizards_roll.lua
index 50d6e3e845f..6f4e768ab0b 100644
--- a/scripts/effects/wizards_roll.lua
+++ b/scripts/effects/wizards_roll.lua
@@ -5,14 +5,13 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    target:addMod(xi.mod.MATT, effect:getPower())
+    effect:addMod(xi.mod.MATT, effect:getPower())
 end
 
 effectObject.onEffectTick = function(target, effect)
 end
 
 effectObject.onEffectLose = function(target, effect)
-    target:delMod(xi.mod.MATT, effect:getPower())
     xi.job_utils.corsair.onRollEffectLose(target, effect)
 end