diff --git a/templates/ktcore/metadata/editable_metadata_fieldsets.smarty b/templates/ktcore/metadata/editable_metadata_fieldsets.smarty
index e5deeb2..95304a0 100644
--- a/templates/ktcore/metadata/editable_metadata_fieldsets.smarty
+++ b/templates/ktcore/metadata/editable_metadata_fieldsets.smarty
@@ -61,25 +61,25 @@
 
   <table class="prettysw" cellpadding="0" cellspacing="0">
    <tbody class="conditional_target">
-<!--
-  { foreach item=oField from=$oFieldset->getFields() }
-    <tr>
-      <th>{$oField->getName()}</th>
-      <td>
-
-  {php}
-  $oField = $this->_tpl_vars['oField'];
-  $sPrefix = $this->_tpl_vars['metadata_prefix'];
-  $sValue = $this->_tpl_vars['values'][$oField->getID()];
-  $this->assign('pattern',
-  	new PatternMetadata($oField->getName(), $sPrefix .  $oField->getID(), $sValue));
-  {/php}
-  {$pattern->render()}
-
-      </td>
-    </tr>
-  { /foreach }
--->
+  {if !$oFieldset->getIsConditional()}
+    { foreach item=oField from=$oFieldset->getFields() }
+      <tr>
+        <th>{$oField->getName()}</th>
+        <td>
+  
+    {php}
+    $oField = $this->_tpl_vars['oField'];
+    $sPrefix = $this->_tpl_vars['metadata_prefix'];
+    $sValue = $this->_tpl_vars['values'][$oField->getID()];
+    $this->assign('pattern',
+    	new PatternMetadata($oField->getName(), $sPrefix .  $oField->getID(), $sValue));
+    {/php}
+    {$pattern->render()}
+  
+        </td>
+      </tr>
+    { /foreach }
+  {/if}
    </tbody>
   </table>
 </fieldset>