diff --git a/include/boost/unordered/detail/table.hpp b/include/boost/unordered/detail/table.hpp
index c45502cc..91c0a098 100644
--- a/include/boost/unordered/detail/table.hpp
+++ b/include/boost/unordered/detail/table.hpp
@@ -143,7 +143,7 @@ namespace boost { namespace unordered { namespace detail {
             return double_to_size_t(ceil(
                     static_cast<double>(this->mlf_) *
                     static_cast<double>(this->bucket_count_)
-                )) - 1;
+                ));
 
         }
 
diff --git a/test/unordered/compile_tests.hpp b/test/unordered/compile_tests.hpp
index 1d556e94..429166d3 100644
--- a/test/unordered/compile_tests.hpp
+++ b/test/unordered/compile_tests.hpp
@@ -144,7 +144,9 @@ void unordered_destructible_test(X&)
 #if !defined(BOOST_NO_RVALUE_REFERENCES)
     X x2(rvalue_default<X>());
     X x3 = rvalue_default<X>();
-    x2 = rvalue_default<X>();
+    // This can only be done if propagate_on_container_move_assignment::value
+    // is true.
+    // x2 = rvalue_default<X>();
 #endif
 
     X* ptr = new X();