diff --git a/include/ndn-cpp/c/common.h b/include/ndn-cpp/c/common.h
index 54a080c..0cb68d5 100644
--- a/include/ndn-cpp/c/common.h
+++ b/include/ndn-cpp/c/common.h
@@ -19,12 +19,12 @@
 /**
  * A time interval represented as the number of milliseconds.
  */
-typedef double ndn_Milliseconds;
+typedef int64_t ndn_Milliseconds;
    
 /**
  * The calendar time represented as the number of milliseconds since 1/1/1970.
  */
-typedef double ndn_MillisecondsSince1970;
+typedef int64_t ndn_MillisecondsSince1970;
 
 #ifdef __cplusplus
 }
diff --git a/include/ndn-cpp/common.hpp b/include/ndn-cpp/common.hpp
index 9a79f62..749cb95 100644
--- a/include/ndn-cpp/common.hpp
+++ b/include/ndn-cpp/common.hpp
@@ -73,12 +73,12 @@
 /**
  * A time interval represented as the number of milliseconds.
  */
-typedef double Milliseconds;
+typedef int64_t Milliseconds;
    
 /**
  * The calendar time represented as the number of milliseconds since 1/1/1970.
  */
-typedef double MillisecondsSince1970;
+typedef int64_t MillisecondsSince1970;
 
 /**
  * Return the hex representation of the bytes in array.
diff --git a/src/node.cpp b/src/node.cpp
index 7d04203..408811b 100644
--- a/src/node.cpp
+++ b/src/node.cpp
@@ -338,11 +338,11 @@
   interestStruct_(new struct ndn_Interest)
 {
   // Set up timeoutTime_.
-  if (interest_->getInterestLifetimeMilliseconds() >= 0.0)
+  if (interest_->getInterestLifetimeMilliseconds() >= 0)
     timeoutTimeMilliseconds_ = ndn_getNowMilliseconds() + interest_->getInterestLifetimeMilliseconds();
   else
     // No timeout.
-    timeoutTimeMilliseconds_ = -1.0;
+    timeoutTimeMilliseconds_ = -1;
   
   // Set up interestStruct_.
   // TODO: Doesn't this belong in the Interest class?