diff --git a/sim/shaman/elemental/TestElemental.results b/sim/shaman/elemental/TestElemental.results
index c3bd22cfd..d70a81702 100644
--- a/sim/shaman/elemental/TestElemental.results
+++ b/sim/shaman/elemental/TestElemental.results
@@ -610,8 +610,8 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Phase1-AllItems-Stormcaller'sGarb"
  value: {
-  dps: 626.70795
-  tps: 648.02608
+  dps: 627.85534
+  tps: 649.17347
  }
 }
 dps_results: {
@@ -771,8 +771,8 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Phase2-AllItems-Stormcaller'sGarb"
  value: {
-  dps: 640.11715
-  tps: 661.43691
+  dps: 641.27114
+  tps: 662.59089
  }
 }
 dps_results: {
@@ -932,8 +932,8 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Phase3-AllItems-Stormcaller'sGarb"
  value: {
-  dps: 696.0052
-  tps: 717.68324
+  dps: 697.5924
+  tps: 719.27044
  }
 }
 dps_results: {
@@ -1093,8 +1093,8 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Phase4-AllItems-Stormcaller'sGarb"
  value: {
-  dps: 703.6728
-  tps: 725.47428
+  dps: 705.76852
+  tps: 727.57001
  }
 }
 dps_results: {
@@ -1254,8 +1254,8 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Phase5-AllItems-Stormcaller'sGarb"
  value: {
-  dps: 787.18253
-  tps: 809.07302
+  dps: 789.46798
+  tps: 811.35846
  }
 }
 dps_results: {
@@ -1415,8 +1415,8 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Phase6-AllItems-Stormcaller'sGarb"
  value: {
-  dps: 819.33223
-  tps: 841.08456
+  dps: 821.25887
+  tps: 843.01119
  }
 }
 dps_results: {
diff --git a/sim/shaman/item_sets_pve.go b/sim/shaman/item_sets_pve.go
index ec8003673..5dbef8460 100644
--- a/sim/shaman/item_sets_pve.go
+++ b/sim/shaman/item_sets_pve.go
@@ -22,16 +22,14 @@ var ItemSetTheFiveThunders = core.NewItemSet(core.ItemSet{
 			c := agent.GetCharacter()
 
 			procAura := c.NewTemporaryStatsAura("The Furious Storm", core.ActionID{SpellID: 27775}, stats.Stats{stats.SpellPower: 95}, time.Second*10)
-			handler := func(sim *core.Simulation, spell *core.Spell, _ *core.SpellResult) {
-				procAura.Activate(sim)
-			}
-
 			core.MakeProcTriggerAura(&c.Unit, core.ProcTrigger{
 				Name:       "Item - The Furious Storm Proc (Spell Cast)",
 				Callback:   core.CallbackOnCastComplete,
 				ProcMask:   core.ProcMaskSpellDamage | core.ProcMaskSpellHealing,
 				ProcChance: 0.04,
-				Handler:    handler,
+				Handler: func(sim *core.Simulation, spell *core.Spell, _ *core.SpellResult) {
+					procAura.Activate(sim)
+				},
 			})
 		},
 		// Increases damage and healing done by magical spells and effects by up to 23.
@@ -107,7 +105,8 @@ var ItemSetStormcallersGarb = core.NewItemSet(core.ItemSet{
 
 			core.MakeProcTriggerAura(&shaman.Unit, core.ProcTrigger{
 				Name:     "Stormcaller Spelldamage Bonus",
-				Callback: core.CallbackOnCastComplete,
+				Callback: core.CallbackOnSpellHitDealt,
+				Outcome:  core.OutcomeLanded,
 				Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
 					if slices.Contains(affectedSpellCodes, spell.SpellCode) && sim.Proc(0.20, "Stormcaller's Wrath") {
 						buffAura.Activate(sim)
diff --git a/sim/shaman/warden/TestWardenShaman.results b/sim/shaman/warden/TestWardenShaman.results
index f19fb02f2..28d3c9b32 100644
--- a/sim/shaman/warden/TestWardenShaman.results
+++ b/sim/shaman/warden/TestWardenShaman.results
@@ -120,8 +120,8 @@ dps_results: {
 dps_results: {
  key: "TestWardenShaman-Phase1-AllItems-Stormcaller'sGarb"
  value: {
-  dps: 372.68727
-  tps: 513.64459
+  dps: 372.53749
+  tps: 513.34504
  }
 }
 dps_results: {