diff --git a/module/testcase/model.php b/module/testcase/model.php
index 360cdf8777..6f4df04158 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -71,16 +71,17 @@ class testcaseModel extends model
             foreach($this->post->steps as $stepID => $stepDesc)
             {
                 if(empty($stepDesc)) continue;
-                $isGroup       = isset($_POST['stepType'][$stepID]);
+                $stepType      = $this->post->stepType;
                 $step          = new stdClass();
-                $step->parent  = $isGroup ? 0 : $parentStepID;
+                $step->type    = ($stepType[$stepID] == 'item' and $parentStepID == 0) ? 'step' : $stepType[$stepID];
+                $step->parent  = ($step->type == 'item') ? $parentStepID : 0;
                 $step->case    = $caseID;
                 $step->version = 1;
-                $step->type    = $isGroup ? 'group' : 'item';
                 $step->desc    = htmlspecialchars($stepDesc);
                 $step->expect  = htmlspecialchars($this->post->expects[$stepID]);
                 $this->dao->insert(TABLE_CASESTEP)->data($step)->autoCheck()->exec();
-                if($isGroup) $parentStepID = $this->dao->lastInsertID();
+                if($step->type == 'group') $parentStepID = $this->dao->lastInsertID();
+                if($step->type == 'step')  $parentStepID = 0;
             }
             return array('status' => 'created', 'id' => $caseID);
         }
@@ -528,16 +529,17 @@ class testcaseModel extends model
                 foreach($this->post->steps as $stepID => $stepDesc)
                 {
                     if(empty($stepDesc)) continue;
-                    $isGroup       = isset($_POST['stepType'][$stepID]);
+                    $stepType = $this->post->stepType;
                     $step = new stdclass();
-                    $step->parent  = $isGroup ? 0 : $parentStepID;
+                    $step->type    = ($stepType[$stepID] == 'item' and $parentStepID == 0) ? 'step' : $stepType[$stepID];
+                    $step->parent  = ($step->type == 'item') ? $parentStepID : 0;
                     $step->case    = $caseID;
                     $step->version = $version;
-                    $step->type    = $isGroup ? 'group' : 'item';
                     $step->desc    = htmlspecialchars($stepDesc);
                     $step->expect  = htmlspecialchars($this->post->expects[$stepID]);
                     $this->dao->insert(TABLE_CASESTEP)->data($step)->autoCheck()->exec();
-                    if($isGroup) $parentStepID = $this->dao->lastInsertID();
+                    if($step->type == 'group') $parentStepID = $this->dao->lastInsertID();
+                    if($step->type == 'step')  $parentStepID = 0;
                 }
             }
 
diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php
index a554d9365d..dc61ad7a24 100644
--- a/module/testcase/view/view.html.php
+++ b/module/testcase/view/view.html.php
@@ -97,16 +97,16 @@
         foreach($case->steps as $stepID => $step)
         {
             $stepClass = "step-{$step->type}";
-            if($step->type == 'group' or ($step->type == 'item' and $step->parent == 0))
+            if($step->type == 'group' or $step->type == 'step')
             {
                 $stepId++;
                 $childId = 0;
             }
-            if($step->type == 'item' and $step->parent == 0) $stepClass = 'step-group';
+            if($step->type == 'step') $stepClass = 'step-group';
             echo "<tr class='step {$stepClass}'>";
             echo "<th class='step-id'>$stepId</th>";
             echo "<td class='text-left'><div class='input-group'>";
-            if($step->type == 'item' and $step->parent != 0) echo "<span class='step-item-id'>{$stepId}.{$childId}</span>";
+            if($step->type == 'item') echo "<span class='step-item-id'>{$stepId}.{$childId}</span>";
             echo nl2br($step->desc) . "</td>";
             echo "<td class='text-left'>" . nl2br($step->expect) . "</div></td>";
             echo "</tr>";
diff --git a/module/testtask/view/results.html.php b/module/testtask/view/results.html.php
index 398bd6508a..251dcd8a69 100644
--- a/module/testtask/view/results.html.php
+++ b/module/testtask/view/results.html.php
@@ -69,27 +69,26 @@
               <?php
               if(empty($stepResult['type']))   $stepResult['type']   = 'item';
               if(empty($stepResult['parent'])) $stepResult['parent'] = 0;
-              $stepClass = "step-{$stepResult['type']}";
-              if($stepResult['type'] == 'group' or ($stepResult['type'] == 'item' and $stepResult['parent'] == 0))
+              if($stepResult['type'] == 'group' or $stepResult['type'] == 'step')
               {
                   $stepId++;
                   $childId = 0;
               }
-              if($stepResult['type'] == 'item' and $stepResult['parent'] == 0) $stepClass = 'step-group';
+              $stepClass = $stepResult['type'] == 'item' ? 'step-item' : 'step-group';
               $modalID   = $result->id . '-' . $key;
               $fileCount = '(' . count($stepResult['files']) . ')';
               ?>
               <tr class='step <?php echo $stepClass?>'>
                 <td class='step-id'>
                   <?php if($result->caseResult == 'fail'):?>
-                  <?php $inputName = $stepClass == 'step-item' ? 'stepIDList[]' : 'stepGroup[]';?>
+                  <?php $inputName = $stepResult['type'] != 'group' ? 'stepIDList[]' : '';?>
                   <input type='checkbox' name='<?php echo $inputName;?>'  value='<?php echo $key;?>'/>
                   <?php endif;?>
                   <?php echo $stepId;?>
                 </td>
                 <td class='text-left' <?php if($stepResult['type'] == 'group') echo "colspan='6'"?>>
                   <div class='input-group'>
-                  <?php if($stepResult['type'] == 'item' and $stepResult['parent'] != 0) echo "<span class='step-item-id'>{$stepId}.{$childId}</span>";?>
+                  <?php if($stepResult['type'] == 'item') echo "<span class='step-item-id'>{$stepId}.{$childId}</span>";?>
                   <?php if(isset($stepResult['desc'])) echo nl2br($stepResult['desc']);?>
                   </div>
                 </td>
diff --git a/module/testtask/view/runcase.html.php b/module/testtask/view/runcase.html.php
index e8ec6a6ce5..4d18845090 100644
--- a/module/testtask/view/runcase.html.php
+++ b/module/testtask/view/runcase.html.php
@@ -51,7 +51,7 @@
       <?php foreach($run->case->steps as $key => $step):?>
       <?php
       $stepClass = "step-{$step->type}";
-      if($step->type == 'group' or ($step->type == 'item' and $step->parent == 0))
+      if($step->type == 'group' or $step->type == 'step')
       {
           $stepId++;
           $childId = 0;
@@ -62,7 +62,7 @@
         <th class='step-id'><?php echo $stepId;?></th>
         <td class='text-left' <?php if($step->type == 'group') echo "colspan='4'"?>>
           <div class='input-group'>
-          <?php if($step->type == 'item' and $step->parent != 0) echo "<span class='step-item-id'>{$stepId}.{$childId}</span>";?>
+          <?php if($step->type == 'item') echo "<span class='step-item-id'>{$stepId}.{$childId}</span>";?>
           <?php echo nl2br($step->desc);?>
           </div>
         </td>