diff --git a/inc/MESA_handle_logger.h b/inc/MESA_handle_logger.h
index 49cee4a..54aa9ba 100644
--- a/inc/MESA_handle_logger.h
+++ b/inc/MESA_handle_logger.h
@@ -23,21 +23,15 @@ int MESA_handle_runtime_log_creation(const char *conf_path);
 int MESA_handle_runtime_log_reconstruction(const char *conf_path);
 void MESA_handle_runtime_log_destruction();
 
-#define MESA_HANDLE_RUNTIME_LOG(handle, lv, mod, fmt, args...)   \
-    MESA_handle_runtime_log((handle), (lv), (mod), "file %s, line %d, " fmt, \
-                       __FILE__, __LINE__, ##args)
-
-
-
-/*
-#define MESA_HANDLE_RUNTIME_LOG_EXPAND(handle, level, module, fmt, ...)             \
-    {                                                                         \
-        if (MESA_handle_runtime_log_level_enabled(handle, level))             \
-        {                                                                     \
-            MESA_handle_runtime_log(handle, level, module, fmt, __VA_ARGS__); \
-        }                                                                     \
-    }
-*/
+#define MESA_HANDLE_RUNTIME_LOG(handle, level, module, format, ...)                 \
+do                                                                                  \
+{                                                                                   \
+    if (MESA_handle_runtime_log_level_enabled(handle, level))                       \
+    {                                                                               \
+        MESA_handle_runtime_log(handle, level, module, "file %s, line %d, " format, \
+                                __FILE__, __LINE__, ##__VA_ARGS__);                 \
+    }                                                                               \
+} while (0)
 
 int MESA_handle_runtime_log_level_enabled(void *handle, const int level);
     /*