diff --git a/src/client/gkfs_libc.cpp b/src/client/gkfs_libc.cpp
index 617577309e92740a35905842cb582d94905e9336..4584c4deb2b6459366430afaa5c12cfa2a8cbbf6 100644
--- a/src/client/gkfs_libc.cpp
+++ b/src/client/gkfs_libc.cpp
@@ -210,7 +210,7 @@ static ResultEntry* results = nullptr;
 #define GKFS_OPERATION(name, ...)                                              \
     if(CTX->interception_enabled() && is_gkfs_fd(fd)) {                        \
         auto res = gkfs::syscall::gkfs_##name(__VA_ARGS__);                    \
-        DEBUG_INFO("[GKFS] (fd={}) -> res {}", fd, res);                       \
+        DEBUG_INFO("[GKFS] {}(fd={}) -> res {}", #name, fd, res);              \
         return res;                                                            \
     }
 
diff --git a/src/client/open_file_map.cpp b/src/client/open_file_map.cpp
index c54020660e0dbd3a17d54f8cf1283eb4efe71648..8ccec5f03a73dc93525cdb5bed83647643b505cd 100644
--- a/src/client/open_file_map.cpp
+++ b/src/client/open_file_map.cpp
@@ -164,6 +164,7 @@ OpenFileMap::safe_generate_fd_idx_() {
     } else {
         // Return a virtual fd from 10000, but avoid doing all the FD movements
         if(CTX->range_fd()) {
+            fd = generate_fd_idx();
             if(fd_validation_needed) {
                 while(exist(fd)) {
                     fd = generate_fd_idx();