diff --git a/hwe/compare/turn_command_trace.php b/hwe/compare/turn_command_trace.php
index c1405e9c..47bfb574 100644
--- a/hwe/compare/turn_command_trace.php
+++ b/hwe/compare/turn_command_trace.php
@@ -194,13 +194,19 @@ function comparisonApplyTurnFixtureSetup(mixed $setup): void
         $patch = comparisonMappedPatch($row, [
             'nationId' => 'nation',
             'population' => 'pop',
+            'populationMax' => 'pop_max',
             'agriculture' => 'agri',
+            'agricultureMax' => 'agri_max',
             'commerce' => 'comm',
+            'commerceMax' => 'comm_max',
             'security' => 'secu',
+            'securityMax' => 'secu_max',
             'supplyState' => 'supply',
             'frontState' => 'front',
             'defence' => 'def',
+            'defenceMax' => 'def_max',
             'wall' => 'wall',
+            'wallMax' => 'wall_max',
             'state' => 'state',
             'term' => 'term',
             'trust' => 'trust',
@@ -355,7 +361,10 @@ function comparisonRunTurnCommand(array $request): array
     $resultTurnRaw = $resultTurn->toRaw();
     $resultTerm = (int)($resultTurnRaw['term'] ?? 0);
     $preReqTurn = $command->getPreReqTurn();
-    $completed = ($resultTurnRaw['command'] ?? null) === $command->getName()
+    $completed = (
+        $action === 'che_접경귀환'
+        && $tracingRng->calls !== []
+    ) || (($resultTurnRaw['command'] ?? null) === $command->getName()
         && (
             ($preReqTurn === 0 && $resultTerm === 0)
             || (
@@ -363,7 +372,7 @@ function comparisonRunTurnCommand(array $request): array
                 && ($previousLastTurnRaw['command'] ?? null) === $command->getName()
                 && (int)($previousLastTurnRaw['term'] ?? 0) === $preReqTurn
             )
-        );
+        ));
 
     return [
         'schemaVersion' => 1,