diff --git a/include/boost/unordered/detail/implementation.hpp b/include/boost/unordered/detail/implementation.hpp
index 4b669fd5..331cbe9f 100644
--- a/include/boost/unordered/detail/implementation.hpp
+++ b/include/boost/unordered/detail/implementation.hpp
@@ -2179,8 +2179,8 @@ template <> struct pick_policy_impl<64, 2>
 };
 
 template <typename T>
-struct pick_policy : pick_policy_impl<std::numeric_limits<std::size_t>::digits,
-                         std::numeric_limits<std::size_t>::radix>
+struct pick_policy2 : pick_policy_impl<std::numeric_limits<std::size_t>::digits,
+                          std::numeric_limits<std::size_t>::radix>
 {
 };
 
@@ -2190,39 +2190,44 @@ struct pick_policy : pick_policy_impl<std::numeric_limits<std::size_t>::digits,
 // prime policy for integeral types. But not the smaller ones, as they
 // don't have enough unique values for this to be an issue.
 
-template <> struct pick_policy<int>
+template <> struct pick_policy2<int>
 {
     typedef prime_policy<std::size_t> type;
 };
 
-template <> struct pick_policy<unsigned int>
+template <> struct pick_policy2<unsigned int>
 {
     typedef prime_policy<std::size_t> type;
 };
 
-template <> struct pick_policy<long>
+template <> struct pick_policy2<long>
 {
     typedef prime_policy<std::size_t> type;
 };
 
-template <> struct pick_policy<unsigned long>
+template <> struct pick_policy2<unsigned long>
 {
     typedef prime_policy<std::size_t> type;
 };
 
 // TODO: Maybe not if std::size_t is smaller than long long.
 #if !defined(BOOST_NO_LONG_LONG)
-template <> struct pick_policy<boost::long_long_type>
+template <> struct pick_policy2<boost::long_long_type>
 {
     typedef prime_policy<std::size_t> type;
 };
 
-template <> struct pick_policy<boost::ulong_long_type>
+template <> struct pick_policy2<boost::ulong_long_type>
 {
     typedef prime_policy<std::size_t> type;
 };
 #endif
 
+template <typename T>
+struct pick_policy : pick_policy2<typename boost::remove_cv<T>::type>
+{
+};
+
 ////////////////////////////////////////////////////////////////////////////
 // Functions