diff --git a/assets/pipeline-test.yaml b/assets/pipeline-test.yaml
index 397fdd1..ebc5957 100644
--- a/assets/pipeline-test.yaml
+++ b/assets/pipeline-test.yaml
@@ -6,7 +6,6 @@ pipeline:
   id: main
   workflow:
   - async: git
-  - exe: git-rev
   
   - exe: json-reader
 
@@ -17,11 +16,13 @@ pipeline:
   # - exe: buildDart
 
   - async: git-count
-
+  
   - wait-until-string: <!state.git-count> != complete
 
+  - async: git-rev
+
   - while:
-      condition-int: <!property.git-count> == null
+      condition-string: <!property.git-rev> == null
       on-do:
       - exe: git
 
diff --git a/lib/oto/pipeline/pipeline_exe.dart b/lib/oto/pipeline/pipeline_exe.dart
index f4fb5ed..f3416c2 100644
--- a/lib/oto/pipeline/pipeline_exe.dart
+++ b/lib/oto/pipeline/pipeline_exe.dart
@@ -36,8 +36,8 @@ class PipelineExe extends PipelineExecutor {
 
   Future<DataCommand> get commandData async {
     var commandData = Application.instance.dataCommandMap[commandID]!;
-    await Application.instance
-        .printBuildStep('Phase Start: ${commandData.name}', Color.green);
+    await Application.instance.printBuildStep(
+        'Phase Start: ${commandData.name} ($commandID)', Color.green);
     return dataFutrue(commandData);
   }
 
diff --git a/lib/oto/pipeline/pipeline_wait_until.dart b/lib/oto/pipeline/pipeline_wait_until.dart
index e649c08..b49a058 100644
--- a/lib/oto/pipeline/pipeline_wait_until.dart
+++ b/lib/oto/pipeline/pipeline_wait_until.dart
@@ -19,12 +19,12 @@ class PipelineWaitUntil extends PiplineCondition {
   Future execute() async {
     var condition = data.condition!;
     var result = checkCondition(condition);
-    await printCondition('Wait-Unint', condition, 'Start wait.', result);
+    await printCondition('Wait-Until', condition, 'Start wait.', result);
     while (result.result) {
       await Future.delayed(const Duration(milliseconds: 500));
       result = checkCondition(data.condition!);
     }
-    await printCondition('Wait-Unint', condition, 'Loop escape.', result);
+    await printCondition('Wait-Until', condition, 'Loop escape.', result);
     return simpleFuture;
   }
 }