diff --git a/model/ccnx-content-object-header.cc b/model/ccnx-content-object-header.cc
index 581c6c4..2a248e1 100644
--- a/model/ccnx-content-object-header.cc
+++ b/model/ccnx-content-object-header.cc
@@ -63,11 +63,8 @@
 uint32_t
 CcnxContentObjectHeader::GetSerializedSize (void) const
 {
-  // Unfortunately, two serializations are required, unless we can pre-calculate header length... which is not trivial
-  /// \todo This is totally wrong. Need to do some simple packet buffer estimation
-  Buffer tmp(2048);
-  
-  return CcnxEncodingHelper::Serialize (tmp.Begin(), *this);
+  // unfortunately, we don't know exact header size in advance
+  return CcnxEncodingHelper::GetSerializedSize (*this);
 }
     
 void