diff --git a/include/msgpack/v1/adaptor/cpp17/variant.hpp b/include/msgpack/v1/adaptor/cpp17/variant.hpp
index 6d0ca1f7..e9efa757 100644
--- a/include/msgpack/v1/adaptor/cpp17/variant.hpp
+++ b/include/msgpack/v1/adaptor/cpp17/variant.hpp
@@ -11,8 +11,6 @@
 #ifndef MSGPACK_V1_TYPE_VARIANT_HPP
 #define MSGPACK_V1_TYPE_VARIANT_HPP
 
-#define MSGPACK_USE_STD_VARIANT_ADAPTOR
-
 #if defined(MSGPACK_USE_STD_VARIANT_ADAPTOR)
 
 #include "msgpack/cpp_version.hpp"
@@ -43,20 +41,31 @@ MSGPACK_API_VERSION_NAMESPACE(v1) {
     }
   }
 
+  struct object_variant_overload {
+    object_variant_overload(msgpack::object &obj, msgpack::zone &zone)
+      : obj{obj}
+      , zone{zone} {}
+
+    template<typename T>
+    void operator()(T const &value) {
+      obj = msgpack::object(value, zone);
+    }
+
+    msgpack::object &obj;
+    msgpack::zone &zone;
+  };
   } // namespace detail
 
   template <typename... Ts>
   struct as<std::variant<Ts...>, typename std::enable_if<(msgpack::has_as<Ts>::value && ...)>::type> {
     std::variant<Ts...> operator()(msgpack::object const &o) const {
-      if (o.type != msgpack::type::ARRAY) {
-        throw msgpack::type_error{};
-      }
-      if (o.via.array.size != 2) {
-        throw msgpack::type_error{};
-      }
-      if (o.via.array.ptr[0].type != msgpack::type::POSITIVE_INTEGER) {
+      if (  o.type != msgpack::type::ARRAY
+         || o.via.array.size != 2
+         || o.via.array.ptr[0].type != msgpack::type::POSITIVE_INTEGER
+         || o.via.array.ptr[0].via.u64 >= sizeof...(Ts)) {
         throw msgpack::type_error{};
       }
+
       return detail::construct_variant<std::variant<Ts...>, Ts...>(
         o.via.array.ptr[0].as<std::size_t>(),
         o.via.array.ptr[1],
@@ -68,15 +77,13 @@ MSGPACK_API_VERSION_NAMESPACE(v1) {
   template<typename... Ts>
   struct convert<std::variant<Ts...>> {
     msgpack::object const &operator()(msgpack::object const &o, std::variant<Ts...> &v) const {
-      if (o.type != msgpack::type::ARRAY) {
-        throw msgpack::type_error{};
-      }
-      if (o.via.array.size != 2) {
-        throw msgpack::type_error{};
-      }
-      if (o.via.array.ptr[0].type != msgpack::type::POSITIVE_INTEGER) {
+      if (  o.type != msgpack::type::ARRAY
+         || o.via.array.size != 2
+         || o.via.array.ptr[0].type != msgpack::type::POSITIVE_INTEGER
+         || o.via.array.ptr[0].via.u64 >= sizeof...(Ts)) {
         throw msgpack::type_error{};
       }
+
       v =  detail::construct_variant<std::variant<Ts...>, Ts...>(
         o.via.array.ptr[0].as<std::size_t>(),
         o.via.array.ptr[1],
@@ -92,38 +99,24 @@ MSGPACK_API_VERSION_NAMESPACE(v1) {
     msgpack::packer<Stream>& operator()(msgpack::packer<Stream> &o, std::variant<Ts...> const &v) const {
       o.pack_array(2);
       o.pack_uint64(v.index());
-      std::visit([&o](auto const &real_value){o.pack(real_value);}, v);
+      std::visit([&o](auto const &value){o.pack(value);}, v);
       return o;
     }
   };
 
-  // template <typename... Ts>
-  // struct object<std::variant<Ts...>> {
-  //   void operator()(msgpack::object &o, std::variant<Ts...> const &v) const {
-  //     o.type = msgpack::type::ARRAY;
-  //     o.via.array.size = 2;
-  //     msgpack::adaptor::object<std::size_t>(o.via.array.ptr[0], v.index());
-  //     std::visit([&o](auto const &value) {
-  //       msgpack::adaptor::object(o.via.array.ptr[1], value);
-  //     }, v);
-  //   }
-  // };
-  //
-  // template<typename... Ts>
-  // struct object_with_zone<std::variant<Ts...>> {
-  //   void operator()(msgpack::object::with_zone &o, std::variant<Ts...> const &v) const {
-  //     o.type = msgpack::type::ARRAY;
-  //
-  //     msgpack::object *p = static_cast<msgpack::object *>(o.zone.allocate_align(sizeof(msgpack::object) * 2, MSGPACK_ZONE_ALIGNOF(msgpack::object)));
-  //
-  //     o.via.array.size = 2;
-  //     o.via.array.ptr = p;
-  //     msgpack::adaptor::object_with_zone<std::size_t>()(o.via.array.ptr[0], v.index(), o.zone);
-  //     std::visit([&o](auto const &real_value){
-  //       o.via.array.ptr[1] = msgpack::adaptor::object()(real_value, o.zone);
-  //     }, v);
-  //   }
-  // };
+
+  template<typename... Ts>
+  struct object_with_zone<std::variant<Ts...>> {
+    void operator()(msgpack::object::with_zone &o, std::variant<Ts...> const &v) const {
+      msgpack::object *p = static_cast<msgpack::object *>(o.zone.allocate_align(sizeof(msgpack::object) * 2, MSGPACK_ZONE_ALIGNOF(msgpack::object)));
+
+      o.type = msgpack::type::ARRAY;
+      o.via.array.size = 2;
+      o.via.array.ptr = p;
+      o.via.array.ptr[0]= msgpack::object(v.index(), o.zone);
+      std::visit(detail::object_variant_overload(o.via.array.ptr[1], o.zone), v);
+    }
+  };
   } // namespace adaptor
 }
 } // namespace msgpack
diff --git a/test/msgpack_cpp17.cpp b/test/msgpack_cpp17.cpp
index 742a58b6..30a76770 100644
--- a/test/msgpack_cpp17.cpp
+++ b/test/msgpack_cpp17.cpp
@@ -461,7 +461,9 @@ BOOST_AUTO_TEST_CASE(carray_byte_object_with_zone)
     }
 }
 
-BOOST_AUTO_TEST_CASE(variant_as) {
+#if defined(MSGPACK_USE_STD_VARIANT_ADAPTOR)
+
+BOOST_AUTO_TEST_CASE(variant_pack_unpack_as) {
   std::stringstream ss;
   std::variant<bool, int, float, double> val1{1.0};
   msgpack::pack(ss, val1);
@@ -470,6 +472,18 @@ BOOST_AUTO_TEST_CASE(variant_as) {
       msgpack::unpack(str.data(), str.size());
   std::variant<bool, int, float, double> val2 = oh.get().as<std::variant<bool, int, float, double> >();
   BOOST_CHECK(val1 == val2);
+  BOOST_CHECK_THROW((oh.get().as<std::variant<bool>>()), msgpack::type_error);
 }
 
+BOOST_AUTO_TEST_CASE(variant_with_zone) {
+  msgpack::zone z;
+  std::variant<bool, int, float, double> val1{1.0};
+  msgpack::object obj(val1, z);
+  std::variant<bool, int, float, double> val2 = obj.as<std::variant<bool, int, float, double>>();
+  BOOST_CHECK(val1 == val2);
+  BOOST_CHECK_THROW((obj.as<std::variant<bool>>()), msgpack::type_error);
+}
+
+#endif // defined(MSGPACK_USE_STD_VARIANT_ADAPTOR)
+
 #endif // MSGPACK_CPP_VERSION >= 201703