diff --git a/Machines/ILSOS_CCW_H52A/Views/Main/UCMainAutoRunViewModel.cs b/Machines/ILSOS_CCW_H52A/Views/Main/UCMainAutoRunViewModel.cs
index f83df86..029f097 100644
--- a/Machines/ILSOS_CCW_H52A/Views/Main/UCMainAutoRunViewModel.cs
+++ b/Machines/ILSOS_CCW_H52A/Views/Main/UCMainAutoRunViewModel.cs
@@ -115,6 +115,7 @@ namespace ILSOS_CCW_H52A.Views
             CurrentWeldingData.WeldingSpanTimeMilliseconds = "0";
             CurrentWeldingData.LotId = "Default_Lot_Id";
             CurrentWeldingData.CellId = "Default_Cell_Id";
+            CurrentWeldingData.JigNo = "0";
         }
 
         private void VisibleChanged(object obj)
diff --git a/WeldingComponents/LASA/GUI/Canvas/Model.cs b/WeldingComponents/LASA/GUI/Canvas/Model.cs
index f8a916c..2e0c605 100644
--- a/WeldingComponents/LASA/GUI/Canvas/Model.cs
+++ b/WeldingComponents/LASA/GUI/Canvas/Model.cs
@@ -1032,6 +1032,7 @@ namespace CoreUnit.Control.UserControl.Canvas
                 EnableCanvasColor = org.EnableCanvasColor;
                 EnableCanvasGrid = org.EnableCanvasGrid;
                 Layers = (ICanvasLayer[])org.Layers.Clone();
+                m_activeLayer = m_layers[0];
 
                 //var thisDrawing = ActiveLayer as DrawingLayer;
                 //var orgDrawing = org.ActiveLayer as DrawingLayer;