diff --git a/Layout/default/Linework/Index.php b/Layout/default/Linework/Index.php
index 9ee4196f7..4889330d9 100644
--- a/Layout/default/Linework/Index.php
+++ b/Layout/default/Linework/Index.php
@@ -187,7 +187,7 @@
                         <i class="fas fa-angle-up"></i>
                       </div>
                     </td>
-                    <td onclick="togglePipework(<?=$term->id?>)"><?=(empty($term->building->getWorkflowvalue('pipework_finished') && empty($term->building->getWorkflowvalue('ist_pipework_finished')))) ? "<i class='fas fa-times text-danger'></i>" : "<i class='fas fa-check text-success'></i>"?></td>
+                    <td onclick="togglePipework(<?=$term->id?>)"><?=(empty($term->building->getWorkflowvalue('pipework_finished'))) ? "<i class='fas fa-times text-danger'></i>" : "<i class='fas fa-check text-success'></i>"?></td>
                     <td onclick="togglePipework(<?=$term->id?>)"><?=($term->isWorkflowPatchingDone()) ? "<i class='fas fa-check text-success'></i>" : "<i class='fas fa-times text-danger'></i>" ?></td>
                     <td onclick="togglePipework(<?=$term->id?>)"><?=($term->getWorkflowvalue('backbone_finished') != "1") ? "<i class='fas fa-times text-danger'></i>" : "<i class='fas fa-check text-success'></i>" ?></td>
                     <td onclick="togglePipework(<?=$term->id?>)"><?=($term->getWorkflowvalue('bep_deployed') != "1") ? "<i class='fas fa-times text-danger'></i>" : "<i class='fas fa-check text-success'></i>" ?></td>
diff --git a/application/Termination/Termination.php b/application/Termination/Termination.php
index 50210b2f2..d81af0af7 100644
--- a/application/Termination/Termination.php
+++ b/application/Termination/Termination.php
@@ -143,7 +143,7 @@ class Termination extends mfBaseModel {
     
     foreach($item_names as $name) {
       //$this->log->debug(__FILE__.": (Termination ".$this->id.") $name => $type == '".$this->getWorkflowvalue($name)."' (ist: '".$this->getWorkflowvalue("ist_".$name)."')");
-      if(empty($this->getWorkflowvalue($name)) && empty($this->getWorkflowvalue("ist_".$name))) {
+      if(!strlen($this->getWorkflowvalue($name)) && !strlen($this->getWorkflowvalue("ist_".$name))) {
         $done = false;
         break;
       }
@@ -352,4 +352,4 @@ class Termination extends mfBaseModel {
     return $this->$name;
   }
 
-}
\ No newline at end of file
+}