diff --git a/include/nana/gui/msgbox.hpp b/include/nana/gui/msgbox.hpp
index 02b4fe35..a8a447bf 100644
--- a/include/nana/gui/msgbox.hpp
+++ b/include/nana/gui/msgbox.hpp
@@ -255,7 +255,11 @@ namespace nana
 		bool show_modal(Args&& ... args)
 		{
 			std::vector<abstract_content*> contents;
+#ifdef __cpp_fold_expressions
+			(contents.emplace_back(&args), ...);
+#else
 			_m_fetch_args(contents, std::forward<Args>(args)...);
+#endif
 
 			if (contents.empty())
 				return false;
diff --git a/include/nana/internationalization.hpp b/include/nana/internationalization.hpp
index cab02568..cba03bf5 100644
--- a/include/nana/internationalization.hpp
+++ b/include/nana/internationalization.hpp
@@ -1,7 +1,7 @@
 /*
  *	An Implementation of i18n
  *	Nana C++ Library(http://www.nanapro.org)
- *	Copyright(C) 2003-2016 Jinhao(cnjinhao@hotmail.com)
+ *	Copyright(C) 2003-2018 Jinhao(cnjinhao@hotmail.com)
  *
  *	Distributed under the Boost Software License, Version 1.0.
  *	(See accompanying file LICENSE_1_0.txt or copy at
diff --git a/source/gui/msgbox.cpp b/source/gui/msgbox.cpp
index 36a7c202..caf6380b 100644
--- a/source/gui/msgbox.cpp
+++ b/source/gui/msgbox.cpp
@@ -1,7 +1,7 @@
 /*
  *	A Message Box Class
  *	Nana C++ Library(http://www.nanapro.org)
- *	Copyright(C) 2003-2017 Jinhao(cnjinhao@hotmail.com)
+ *	Copyright(C) 2003-2018 Jinhao(cnjinhao@hotmail.com)
  *
  *	Distributed under the Boost Software License, Version 1.0.
  *	(See accompanying file LICENSE_1_0.txt or copy at
@@ -1294,7 +1294,7 @@ namespace nana
         min_width_entry_field_pixels_ = pixels;
 	}
 
-#ifndef _nana_cxx_folding_expression
+#ifndef __cpp_fold_expressions
 	void inputbox::_m_fetch_args(std::vector<abstract_content*>&)
 	{}
 #endif
diff --git a/source/internationalization.cpp b/source/internationalization.cpp
index 6e4a99d5..d41b775c 100644
--- a/source/internationalization.cpp
+++ b/source/internationalization.cpp
@@ -417,7 +417,7 @@ namespace nana
 		}
 	}
 
-#ifndef _nana_cxx_folding_expression
+#ifndef __cpp_fold_expressions
 	void internationalization::_m_fetch_args(std::vector<std::string>&)
 	{}
 #endif