diff --git a/include/sol/stack_check_qualified.hpp b/include/sol/stack_check_qualified.hpp
index 7e357973..70bf599a 100644
--- a/include/sol/stack_check_qualified.hpp
+++ b/include/sol/stack_check_qualified.hpp
@@ -36,8 +36,8 @@ namespace stack {
 			if constexpr (!std::is_reference_v<X> && is_unique_usertype_v<X>) {
 				using u_traits = unique_usertype_traits<meta::unqualified_t<X>>;
 				using T = typename u_traits::type;
-				using rebind_t = typename u_traits::template rebind_base<void>;
-				if constexpr (!std::is_void_v<rebind_t>) {
+				if constexpr (!is_base_rebindable_non_void_v<u_traits>) {
+					using rebind_t = typename u_traits::template rebind_base<void>;
 					// we have a unique pointer type that can be
 					// rebound to a base/derived type
 					const type indextype = type_of(L, index);
diff --git a/single/include/sol/forward.hpp b/single/include/sol/forward.hpp
index f14e726c..aa26122f 100644
--- a/single/include/sol/forward.hpp
+++ b/single/include/sol/forward.hpp
@@ -20,8 +20,8 @@
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 // This file was generated with a script.
-// Generated 2019-04-13 08:04:51.418277 UTC
-// This header was generated with sol v3.0.1-beta2 (revision d17f967)
+// Generated 2019-04-13 08:51:54.424585 UTC
+// This header was generated with sol v3.0.1-beta2 (revision 6282ed4)
 // https://github.com/ThePhD/sol2
 
 #ifndef SOL_SINGLE_INCLUDE_FORWARD_HPP
diff --git a/single/include/sol/sol.hpp b/single/include/sol/sol.hpp
index cce238e0..96fd525e 100644
--- a/single/include/sol/sol.hpp
+++ b/single/include/sol/sol.hpp
@@ -20,8 +20,8 @@
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 // This file was generated with a script.
-// Generated 2019-04-13 08:04:48.327520 UTC
-// This header was generated with sol v3.0.1-beta2 (revision d17f967)
+// Generated 2019-04-13 08:51:53.095601 UTC
+// This header was generated with sol v3.0.1-beta2 (revision 6282ed4)
 // https://github.com/ThePhD/sol2
 
 #ifndef SOL_SINGLE_INCLUDE_HPP
@@ -11075,8 +11075,8 @@ namespace stack {
 			if constexpr (!std::is_reference_v<X> && is_unique_usertype_v<X>) {
 				using u_traits = unique_usertype_traits<meta::unqualified_t<X>>;
 				using T = typename u_traits::type;
-				using rebind_t = typename u_traits::template rebind_base<void>;
-				if constexpr (!std::is_void_v<rebind_t>) {
+				if constexpr (!is_base_rebindable_non_void_v<u_traits>) {
+					using rebind_t = typename u_traits::template rebind_base<void>;
 					// we have a unique pointer type that can be
 					// rebound to a base/derived type
 					const type indextype = type_of(L, index);