diff --git a/src/act.ts b/src/act.ts
index a5c7658..bb25f05 100644
--- a/src/act.ts
+++ b/src/act.ts
@@ -445,7 +445,7 @@ export class Act {
                                         },
                                         steps: [
                                             {
-                                                id: -1, // Special id for setup job
+                                                id: "--setup-job", // Special id for setup job
                                                 name: 'Setup Job',
                                                 status: HistoryStatus.Running,
                                                 date: {
@@ -460,13 +460,13 @@ export class Act {
                                 const isCompleteJobStep = this.historyManager.workspaceHistory[commandArgs.path][historyIndex].jobs![jobIndex].steps!.length > 1;
                                 if (parsedMessage.stepID || isCompleteJobStep) {
                                     let stepName: string;
-                                    let stepId: number;
+                                    let stepId: string;
                                     if (!parsedMessage.stepID && isCompleteJobStep) {
                                         stepName = 'Complete Job';
-                                        stepId = -2; // Special Id for complete job
+                                        stepId = "--complete-job"; // Special Id for complete job
                                     } else {
                                         stepName = parsedMessage.stage !== 'Main' ? `${parsedMessage.stage} ${parsedMessage.step}` : parsedMessage.step;
-                                        stepId = parseInt(parsedMessage.stepID[0]);
+                                        stepId = parsedMessage.stepID[0];
                                     }
 
                                     if (this.historyManager.workspaceHistory[commandArgs.path][historyIndex].jobs![jobIndex].steps![0].status === HistoryStatus.Running) {
diff --git a/src/historyManager.ts b/src/historyManager.ts
index 8654df2..3bf8f25 100644
--- a/src/historyManager.ts
+++ b/src/historyManager.ts
@@ -29,7 +29,7 @@ export interface Job {
 }
 
 export interface Step {
-    id: number,
+    id: string,
     name: string,
     status: HistoryStatus,
     date: {