diff --git a/repertory/librepertory/src/drives/fuse/remotefuse/remote_server.cpp b/repertory/librepertory/src/drives/fuse/remotefuse/remote_server.cpp
index ba3aa8d6..ea768877 100644
--- a/repertory/librepertory/src/drives/fuse/remotefuse/remote_server.cpp
+++ b/repertory/librepertory/src/drives/fuse/remotefuse/remote_server.cpp
@@ -168,18 +168,25 @@ void remote_server::populate_stat(const struct stat64 &unix_st,
 #else  // !defined(__APPLE__)
   r_stat.st_flags = 0;
 
-  r_stat.st_atimespec = static_cast<remote::file_time>(
-      unix_st.st_atim.tv_nsec +
-      (unix_st.st_atim.tv_sec * utils::time::NANOS_PER_SECOND));
-  r_stat.st_birthtimespec = static_cast<remote::file_time>(
-      unix_st.st_ctim.tv_nsec +
-      (unix_st.st_ctim.tv_sec * utils::time::NANOS_PER_SECOND));
-  r_stat.st_ctimespec = static_cast<remote::file_time>(
-      unix_st.st_ctim.tv_nsec +
-      (unix_st.st_ctim.tv_sec * utils::time::NANOS_PER_SECOND));
-  r_stat.st_mtimespec = static_cast<remote::file_time>(
-      unix_st.st_mtim.tv_nsec +
-      (unix_st.st_mtim.tv_sec * utils::time::NANOS_PER_SECOND));
+  r_stat.st_atimespec =
+      static_cast<remote::file_time>(unix_st.st_atim.tv_nsec) +
+      (static_cast<remote::file_time>(unix_st.st_atim.tv_sec) *
+       utils::time::NANOS_PER_SECOND);
+
+  r_stat.st_birthtimespec =
+      static_cast<remote::file_time>(unix_st.st_ctim.tv_nsec) +
+      (static_cast<remote::file_time>(unix_st.st_ctim.tv_sec) *
+       utils::time::NANOS_PER_SECOND);
+
+  r_stat.st_ctimespec =
+      static_cast<remote::file_time>(unix_st.st_ctim.tv_nsec) +
+      (static_cast<remote::file_time>(unix_st.st_ctim.tv_sec) *
+       utils::time::NANOS_PER_SECOND);
+
+  r_stat.st_mtimespec =
+      static_cast<remote::file_time>(unix_st.st_mtim.tv_nsec) +
+      (static_cast<remote::file_time>(unix_st.st_mtim.tv_sec) *
+       utils::time::NANOS_PER_SECOND);
 #endif // defined(__APPLE__)
   r_stat.st_blksize = static_cast<remote::block_size>(unix_st.st_blksize);
   r_stat.st_blocks = static_cast<remote::block_count>(unix_st.st_blocks);