diff --git a/src/face.cpp b/src/face.cpp
index b137765..f5ce755 100644
--- a/src/face.cpp
+++ b/src/face.cpp
@@ -12,16 +12,18 @@
 namespace ndn {
   
 uint64_t 
-Face::expressInterest(const Name& name, const Interest *interestTemplate, const OnData& onData, const OnTimeout& onTimeout)
+Face::expressInterest
+  (const Name& name, const Interest *interestTemplate, const OnData& onData, const OnTimeout& onTimeout,
+   WireFormat& wireFormat)
 {
   if (interestTemplate)
     return node_.expressInterest(Interest
       (name, interestTemplate->getMinSuffixComponents(), interestTemplate->getMaxSuffixComponents(),
        interestTemplate->getPublisherPublicKeyDigest(), interestTemplate->getExclude(),
        interestTemplate->getChildSelector(), interestTemplate->getAnswerOriginKind(),
-       interestTemplate->getScope(), interestTemplate->getInterestLifetimeMilliseconds()), onData, onTimeout);
+       interestTemplate->getScope(), interestTemplate->getInterestLifetimeMilliseconds()), onData, onTimeout, wireFormat);
   else
-    return node_.expressInterest(Interest(name, 4000.0), onData, onTimeout);  
+    return node_.expressInterest(Interest(name, 4000.0), onData, onTimeout, wireFormat);  
 }
 
 void 
diff --git a/src/node.cpp b/src/node.cpp
index ade4a6e..a31144c 100644
--- a/src/node.cpp
+++ b/src/node.cpp
@@ -118,7 +118,7 @@
 }
 
 uint64_t 
-Node::expressInterest(const Interest& interest, const OnData& onData, const OnTimeout& onTimeout)
+Node::expressInterest(const Interest& interest, const OnData& onData, const OnTimeout& onTimeout, WireFormat& wireFormat)
 {
   // TODO: Properly check if we are already connected to the expected host.
   if (!transport_->getIsConnected())
@@ -128,7 +128,7 @@
   pendingInterestTable_.push_back(shared_ptr<PendingInterest>(new PendingInterest
     (pendingInterestId, shared_ptr<const Interest>(new Interest(interest)), onData, onTimeout)));
   
-  Blob encoding = interest.wireEncode();  
+  Blob encoding = interest.wireEncode(wireFormat);  
   transport_->send(*encoding);
   
   return pendingInterestId;
@@ -158,7 +158,7 @@
       (shared_ptr<NdndIdFetcher::Info>(new NdndIdFetcher::Info
         (this, registeredPrefixId, prefix, onInterest, onRegisterFailed, flags, wireFormat)));
     // It is OK for func_lib::function make a copy of the function object because the Info is in a shared_ptr.
-    expressInterest(ndndIdFetcherInterest_, fetcher, fetcher);
+    expressInterest(ndndIdFetcherInterest_, fetcher, fetcher, wireFormat);
   }
   else
     registerPrefixHelper(registeredPrefixId, make_shared<const Name>(prefix), onInterest, onRegisterFailed, flags, wireFormat);
