diff --git a/lib/bcdice/game_system/sword_world/transcendent_test.rb b/lib/bcdice/game_system/sword_world/transcendent_test.rb
index 2595903cf..30a263b04 100644
--- a/lib/bcdice/game_system/sword_world/transcendent_test.rb
+++ b/lib/bcdice/game_system/sword_world/transcendent_test.rb
@@ -39,7 +39,7 @@ def execute(randomizer)
           fumble = first_value_group == [1, 1]
           critical = first_value_group == [6, 6]
 
-          if !fumble && !critical
+          unless fumble
             while sum_of_dice(value_groups.last) >= @critical_value
               value_groups.push(randomizer.roll_barabara(2, 6))
             end
diff --git a/test/data/SwordWorld2_0.toml b/test/data/SwordWorld2_0.toml
index fdb9f5124..95de01244 100644
--- a/test/data/SwordWorld2_0.toml
+++ b/test/data/SwordWorld2_0.toml
@@ -526,12 +526,14 @@ rands = [
 [[ test ]]
 game_system = "SwordWorld2.0"
 input = "2D6@10+31>=30"
-output = "(2D6@10+31>=30) ＞ 12[6,6]+31 ＞ 43 ＞ 自動的成功"
+output = "(2D6@10+31>=30) ＞ 20[6,6][2,6]+31 ＞ 51 ＞ 自動的成功"
 success = true
 critical = true
 rands = [
   { sides = 6, value = 6 },
   { sides = 6, value = 6 },
+  { sides = 6, value = 2 },
+  { sides = 6, value = 6 },
 ]
 
 [[ test ]]
@@ -587,12 +589,14 @@ rands = []
 [[ test ]]
 game_system = "SwordWorld2.0"
 input = "2d6@10+11>30"
-output = "(2D6@10+11>30) ＞ 12[6,6]+11 ＞ 23 ＞ 自動的成功"
+output = "(2D6@10+11>30) ＞ 20[6,6][2,6]+11 ＞ 31 ＞ 自動的成功"
 success = true
 critical = true
 rands = [
   { sides = 6, value = 6 },
   { sides = 6, value = 6 },
+  { sides = 6, value = 2 },
+  { sides = 6, value = 6 },
 ]
 
 [[ test ]]
diff --git a/test/data/SwordWorld2_0_SimplifiedChinese.toml b/test/data/SwordWorld2_0_SimplifiedChinese.toml
index 9fb658145..5ca3b93ff 100644
--- a/test/data/SwordWorld2_0_SimplifiedChinese.toml
+++ b/test/data/SwordWorld2_0_SimplifiedChinese.toml
@@ -526,12 +526,14 @@ rands = [
 [[ test ]]
 game_system = "SwordWorld2.0:SimplifiedChinese"
 input = "2D6@10+31>=30"
-output = "(2D6@10+31>=30) ＞ 12[6,6]+31 ＞ 43 ＞ 自动成功"
+output = "(2D6@10+31>=30) ＞ 20[6,6][2,6]+31 ＞ 51 ＞ 自动成功"
 success = true
 critical = true
 rands = [
   { sides = 6, value = 6 },
   { sides = 6, value = 6 },
+  { sides = 6, value = 2 },
+  { sides = 6, value = 6 },
 ]
 
 [[ test ]]
@@ -587,12 +589,14 @@ rands = []
 [[ test ]]
 game_system = "SwordWorld2.0:SimplifiedChinese"
 input = "2d6@10+11>30"
-output = "(2D6@10+11>30) ＞ 12[6,6]+11 ＞ 23 ＞ 自动成功"
+output = "(2D6@10+11>30) ＞ 20[6,6][2,6]+11 ＞ 31 ＞ 自动成功"
 success = true
 critical = true
 rands = [
   { sides = 6, value = 6 },
   { sides = 6, value = 6 },
+  { sides = 6, value = 2 },
+  { sides = 6, value = 6 },
 ]
 
 [[ test ]]
diff --git a/test/data/SwordWorld2_5.toml b/test/data/SwordWorld2_5.toml
index 9707018d0..952c9593e 100644
--- a/test/data/SwordWorld2_5.toml
+++ b/test/data/SwordWorld2_5.toml
@@ -622,12 +622,14 @@ rands = [
 [[ test ]]
 game_system = "SwordWorld2.5"
 input = "2D6@10+31>=30"
-output = "(2D6@10+31>=30) ＞ 12[6,6]+31 ＞ 43 ＞ 自動的成功"
+output = "(2D6@10+31>=30) ＞ 20[6,6][2,6]+31 ＞ 51 ＞ 自動的成功"
 success = true
 critical = true
 rands = [
   { sides = 6, value = 6 },
   { sides = 6, value = 6 },
+  { sides = 6, value = 2 },
+  { sides = 6, value = 6 },
 ]
 
 [[ test ]]
@@ -683,12 +685,14 @@ rands = []
 [[ test ]]
 game_system = "SwordWorld2.5"
 input = "2d6@10+11>30"
-output = "(2D6@10+11>30) ＞ 12[6,6]+11 ＞ 23 ＞ 自動的成功"
+output = "(2D6@10+11>30) ＞ 20[6,6][2,6]+11 ＞ 31 ＞ 自動的成功"
 success = true
 critical = true
 rands = [
   { sides = 6, value = 6 },
   { sides = 6, value = 6 },
+  { sides = 6, value = 2 },
+  { sides = 6, value = 6 },
 ]
 
 [[ test ]]
diff --git a/test/data/SwordWorld2_5_SimplifiedChinese.toml b/test/data/SwordWorld2_5_SimplifiedChinese.toml
index 586396a25..0a8df1eaf 100644
--- a/test/data/SwordWorld2_5_SimplifiedChinese.toml
+++ b/test/data/SwordWorld2_5_SimplifiedChinese.toml
@@ -622,12 +622,14 @@ rands = [
 [[ test ]]
 game_system = "SwordWorld2.5:SimplifiedChinese"
 input = "2D6@10+31>=30"
-output = "(2D6@10+31>=30) ＞ 12[6,6]+31 ＞ 43 ＞ 自动成功"
+output = "(2D6@10+31>=30) ＞ 20[6,6][2,6]+31 ＞ 51 ＞ 自动成功"
 success = true
 critical = true
 rands = [
   { sides = 6, value = 6 },
   { sides = 6, value = 6 },
+  { sides = 6, value = 2 },
+  { sides = 6, value = 6 },
 ]
 
 [[ test ]]
@@ -683,12 +685,14 @@ rands = []
 [[ test ]]
 game_system = "SwordWorld2.5:SimplifiedChinese"
 input = "2d6@10+11>30"
-output = "(2D6@10+11>30) ＞ 12[6,6]+11 ＞ 23 ＞ 自动成功"
+output = "(2D6@10+11>30) ＞ 20[6,6][2,6]+11 ＞ 31 ＞ 自动成功"
 success = true
 critical = true
 rands = [
   { sides = 6, value = 6 },
   { sides = 6, value = 6 },
+  { sides = 6, value = 2 },
+  { sides = 6, value = 6 },
 ]
 
 [[ test ]]