diff --git a/include/spdlog/spdlog.h b/include/spdlog/spdlog.h
index ab94bc96..372ebea4 100644
--- a/include/spdlog/spdlog.h
+++ b/include/spdlog/spdlog.h
@@ -138,15 +138,15 @@ void drop_all();
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef SPDLOG_TRACE_ON
-#define SPDLOG_TRACE(logger, ...) logger->trace(__VA_ARGS__) << " (" << __FILE__ << " #" << __LINE__ <<")"
+#define SPDLOG_TRACE(logger)		(logger)->trace("[{}({})]:", __FILE__, __LINE__)
 #else
-#define SPDLOG_TRACE(logger, ...) while(false) logger->trace()
+#define SPDLOG_TRACE(logger)		while(false) logger->trace()
 #endif
 
 #ifdef SPDLOG_DEBUG_ON
-#define SPDLOG_DEBUG(logger, ...) logger->debug(__VA_ARGS__)  << " (" << __FILE__ << " #" << __LINE__ <<")"
+#define SPDLOG_DEBUG(logger)		(logger)->debug("[{}({})]:", __FILE__, __LINE__)
 #else
-#define SPDLOG_DEBUG(logger, ...) while(false) logger->debug()
+#define SPDLOG_DEBUG(logger)		while(false) logger->debug()
 #endif