diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9f6d3b..2dba0e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,8 +97,8 @@ set( sources
 
 add_subdirectory(vendor) 
 
-add_executable( date t.cpp )
-target_link_libraries( date fc ${Boost_THREAD_LIBRARY} ${Boost_CONTEXT_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_CHRONO_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ${rt_library}  ${Boost_DATE_TIME_LIBRARY})
+#add_executable( date t.cpp )
+#target_link_libraries( date fc ${Boost_THREAD_LIBRARY} ${Boost_CONTEXT_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_CHRONO_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ${rt_library}  ${Boost_DATE_TIME_LIBRARY})
 
 setup_library( fc SOURCES ${sources} )
 
diff --git a/src/time.cpp b/src/time.cpp
index b82aa36..93aa57f 100644
--- a/src/time.cpp
+++ b/src/time.cpp
@@ -1,7 +1,7 @@
+#include <fc/time.hpp>
 #include <fc/value_cast.hpp>
 #include <boost/chrono/system_clocks.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
-#include <fc/time.hpp>
 #include <sstream>
 
 namespace fc {
@@ -13,7 +13,8 @@ namespace fc {
       bch::system_clock::time_point tp; 
       tp += bch::microseconds( elapsed._count);
       time_t tt = bch::system_clock::to_time_t(tp);
-      return boost::posix_time::to_iso_string( boost::posix_time::from_time_t(tt) + boost::posix_time::microseconds( elapsed._count - tt*1000000 ));
+      
+      return boost::posix_time::to_iso_string( boost::posix_time::from_time_t(tt) + boost::posix_time::microseconds( elapsed._count % 1000000 ) ); 
   }
   time_point time_point::from_iso_string( const fc::string& s ) {
      auto pt = boost::posix_time::from_iso_string(s);