diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index ad20b36cb..6eaab1445 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -975,8 +975,10 @@ class CppGenerator : public BaseGenerator {
                   if (invector) {
                     return "*" + val;
                   } else {
-                    return "std::unique_ptr<" + type.struct_def->name +
-                           ">(new " + type.struct_def->name + "(*" + val + "))";
+                    return "std::unique_ptr<" +
+                           WrapInNameSpace (*type.struct_def) +
+                           ">(new " +
+                           WrapInNameSpace (*type.struct_def) + "(*" + val + "))";
                   }
                 } else {
                   return val + "->UnPack()";