diff --git a/src/TNL/Devices/SystemInfo.cpp b/src/TNL/Devices/SystemInfo.cpp
index 38f85230155e35f17caa20e8bbd26d9f3eaf9261..9ad5e19b9f42ffb99a1c9a89d825383f96b70c94 100644
--- a/src/TNL/Devices/SystemInfo.cpp
+++ b/src/TNL/Devices/SystemInfo.cpp
@@ -11,7 +11,6 @@
 #include <set>
 #include <iomanip>
 #include <cstring>
-#include <ctime>
 
 #include <unistd.h>
 #include <sys/utsname.h>
@@ -65,13 +64,9 @@ SystemInfo::getCurrentTime( const char* format )
 {
    const std::time_t time_since_epoch = std::time( nullptr );
    std::tm* localtime = std::localtime( &time_since_epoch );
-   // TODO: use std::put_time in the future (available since GCC 5)
-//   std::stringstream ss;
-//   ss << std::put_time( localtime, format );
-//   return String( ss.str().c_str() );
-   char buffer[1024];
-   std::strftime( buffer, 1024, format, localtime );
-   return String( buffer );
+   std::stringstream ss;
+   ss << std::put_time( localtime, format );
+   return String( ss.str().c_str() );
 }