diff --git a/include/boost/preprocessor/variadic/detail/opt.hpp b/include/boost/preprocessor/variadic/detail/opt.hpp
index 3b50850..e5798ee 100644
--- a/include/boost/preprocessor/variadic/detail/opt.hpp
+++ b/include/boost/preprocessor/variadic/detail/opt.hpp
@@ -17,7 +17,7 @@
 # if BOOST_PP_VARIADICS && defined(__cplusplus) && __cplusplus > 201703L
 #
 # define BOOST_PP_VARIADIC_OPT_FUNCTION(...) \
-    __VA_OPT__(0,) 0, 0, 1 \
+    __VA_OPT__(,) , 1, 0 \
 /**/
 #
 # define BOOST_PP_VARIADIC_OPT_ELEM0(e0, ...) BOOST_PP_VARIADIC_OPT_ELEM_0(e0,__VA_ARGS__)
diff --git a/include/boost/preprocessor/variadic/opt.hpp b/include/boost/preprocessor/variadic/opt.hpp
index c26b0d8..09d37c4 100644
--- a/include/boost/preprocessor/variadic/opt.hpp
+++ b/include/boost/preprocessor/variadic/opt.hpp
@@ -19,7 +19,7 @@
 # if BOOST_PP_VARIADICS && defined(__cplusplus) && __cplusplus > 201703L
 # include <boost/preprocessor/variadic/detail/opt.hpp>
 # define BOOST_PP_VARIADIC_OPT() \
-  BOOST_PP_VARIADIC_OPT_ELEM2(BOOST_PP_VARIADIC_OPT_FUNCTION(),) \
+  BOOST_PP_VARIADIC_OPT_ELEM2(BOOST_PP_VARIADIC_OPT_FUNCTION(?),) \
 /**/
 # else
 # define BOOST_PP_VARIADIC_OPT() 0