diff --git a/tools/dissect/ndn-dissect.cpp b/tools/dissect/ndn-dissect.cpp
index cf012d8..d21926f 100644
--- a/tools/dissect/ndn-dissect.cpp
+++ b/tools/dissect/ndn-dissect.cpp
@@ -146,13 +146,12 @@
   m_out << " (size: " << block.value_size() << ")";
 
   try {
-    // if (block.type() != tlv::Content && block.type() != tlv::SignatureValue)
-    block.parse();
+    if (block.type() != tlv::SignatureValue) {
+      block.parse();
+    }
   }
   catch (const tlv::Error&) {
     // pass (e.g., leaf block reached)
-
-    // @todo: Figure how to deterministically figure out that value is not recursive TLV block
   }
 
   const auto& elements = block.elements();