diff --git a/TJAPlayer3/Stages/07.Game/CAct演奏ゲージ共通.cs b/TJAPlayer3/Stages/07.Game/CAct演奏ゲージ共通.cs
index 10898300..2bbda9a1 100644
--- a/TJAPlayer3/Stages/07.Game/CAct演奏ゲージ共通.cs
+++ b/TJAPlayer3/Stages/07.Game/CAct演奏ゲージ共通.cs
@@ -211,24 +211,12 @@ namespace TJAPlayer3
 
             double nGaugeRankValue = 0D;
             double[] nGaugeRankValue_branch = new double[] { 0D, 0D, 0D };
-            /*
-            if (this.DTX[nPlayer].GaugeIncreaseMode == GaugeIncreaseMode.Normal)
+
+            nGaugeRankValue = 10000.0f / dbGaugeMaxComboValue;
+            for (int i = 0; i < 3; i++)
             {
-                nGaugeRankValue = Math.Floor(10000.0f / dbGaugeMaxComboValue);
-                for (int i = 0; i < 3; i++)
-                {
-                    nGaugeRankValue_branch[i] = Math.Floor(10000.0f / dbGaugeMaxComboValue_branch[i]);
-                }
+                nGaugeRankValue_branch[i] = 10000.0f / dbGaugeMaxComboValue_branch[i];
             }
-            else
-            {
-                */
-                nGaugeRankValue = 10000.0f / dbGaugeMaxComboValue;
-                for (int i = 0; i < 3; i++)
-                {
-                    nGaugeRankValue_branch[i] = 10000.0f / dbGaugeMaxComboValue_branch[i];
-                }
-            // }
 
             //ゲージ値計算
             //実機に近い計算
diff --git a/TJAPlayer3/Stages/07.Game/CStage演奏画面共通.cs b/TJAPlayer3/Stages/07.Game/CStage演奏画面共通.cs
index 421c2762..0828297e 100644
--- a/TJAPlayer3/Stages/07.Game/CStage演奏画面共通.cs
+++ b/TJAPlayer3/Stages/07.Game/CStage演奏画面共通.cs
@@ -3108,6 +3108,8 @@ namespace TJAPlayer3
                                         IsDanFailed = true;
                                         return true;
                                     }
+
+                                    // Play next song here
                                     this.actDan.Start(this.ListDan_Number);
                                     ListDan_Number++;
                                 }
diff --git a/TJAPlayer3/Stages/07.Game/Taiko/Dan_Cert.cs b/TJAPlayer3/Stages/07.Game/Taiko/Dan_Cert.cs
index 33afb919..053267ba 100644
--- a/TJAPlayer3/Stages/07.Game/Taiko/Dan_Cert.cs
+++ b/TJAPlayer3/Stages/07.Game/Taiko/Dan_Cert.cs
@@ -131,15 +131,6 @@ namespace TJAPlayer3
                 this.ttkExams[i] = new TitleTextureKey(CLangManager.LangInstance.GetString(1010 + i), this.pfExamFont, Color.White, Color.SaddleBrown, 1000);
             }
 
-
-            /*
-            for (int i = 0; i < CExamInfo.cMaxExam; i++)
-            {
-                if (Challenge[i] != null && Challenge[i].GetEnable() == true)
-                    this.ExamCount++;
-            }
-            */
-
             NowCymbolShowingNumber = 0;
             bExamChangeCheck = false;
 
@@ -162,6 +153,8 @@ namespace TJAPlayer3
             for (int i = 0; i < CExamInfo.cMaxExam; i++)
             {
                 if (Challenge[i] == null || !Challenge[i].GetEnable()) continue;
+                if (ExamChange[i] && Challenge[i] != TJAPlayer3.stage選曲.r確定された曲.DanSongs[NowShowingNumber].Dan_C[i]) continue;
+
                 var oldReached = Challenge[i].GetReached();
                 var isChangedAmount = false;