diff --git a/include/boost/type_traits/object_traits.hpp b/include/boost/type_traits/object_traits.hpp
index 501ebf3..3d2fad9 100644
--- a/include/boost/type_traits/object_traits.hpp
+++ b/include/boost/type_traits/object_traits.hpp
@@ -390,8 +390,10 @@ struct is_stateless
 {
   BOOST_STATIC_CONSTANT(bool, value = 
     (::boost::type_traits::ice_and<
+       ::boost::has_trivial_constructor<T>::value,
        ::boost::has_trivial_copy<T>::value,
-       ::boost::has_trivial_destructor<T>::value
+       ::boost::has_trivial_destructor<T>::value,
+       ::boost::is_class<T>::value
      >::value));
 };