diff --git a/include/optional b/include/optional
index 2fad11c..a147d69 100644
--- a/include/optional
+++ b/include/optional
@@ -773,7 +773,7 @@
                       _And<
                           _IsNotSame<__uncvref_t<_Up>, optional>,
                           _Or<
-                              _IsNotSame<_Up, value_type>,
+                              _IsNotSame<__uncvref_t<_Up>, value_type>,
                               _Not<is_scalar<value_type>>
                           >,
                           is_constructible<value_type, _Up>,
diff --git a/test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp b/test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp
index 8d2a8a0..3dd28ac 100644
--- a/test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp
+++ b/test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp
@@ -241,6 +241,16 @@
 
 using Fn = void(*)();
 
+// https://bugs.llvm.org/show_bug.cgi?id=38638
+template <class T>
+constexpr T pr38638(T v)
+{
+  std::optional<T> o;
+  o = v;
+  return *o + 2;
+}
+
+
 int main(int, char**)
 {
     test_sfinae();
@@ -269,5 +279,7 @@
     }
     test_throws();
 
+    static_assert(pr38638(3) == 5, "");
+
   return 0;
 }