diff --git a/include/ndn-cpp/data.hpp b/include/ndn-cpp/data.hpp
index cd6176f..8f97c87 100644
--- a/include/ndn-cpp/data.hpp
+++ b/include/ndn-cpp/data.hpp
@@ -236,10 +236,14 @@
   
 inline void
 Data::setContent(const Block& content) 
-{ 
+{
   onChanged();
 
-  content_ = content;
+  if (content.type() == Tlv::Content)
+    content_ = content;
+  else {
+    content_ = Block(Tlv::Content, content);
+  }
 }
 
 inline const Signature&