diff --git a/graf2d/graf/src/TArrow.cxx b/graf2d/graf/src/TArrow.cxx
index 5299f3007c0ac..5dc48cc07fc2b 100644
--- a/graf2d/graf/src/TArrow.cxx
+++ b/graf2d/graf/src/TArrow.cxx
@@ -364,7 +364,7 @@ void TArrow::SavePrimitive(std::ostream &out, Option_t *option)
 {
    SavePrimitiveConstructor(out, Class(), "arrow",
                             TString::Format("%g, %g, %g, %g, %g, \"%s\"", fX1, fY1, fX2, fY2, fArrowSize,
-                                            TString(GetDrawOption()).ReplaceSpecialCppChars().Data()));
+                                            TString(GetOption()).ReplaceSpecialCppChars().Data()));
 
    SaveFillAttributes(out, "arrow", 0, 1);
    SaveLineAttributes(out, "arrow", 1, 1, 1);
diff --git a/hist/hist/src/THStack.cxx b/hist/hist/src/THStack.cxx
index bb512a9e2ce68..f56e7eeaeb155 100644
--- a/hist/hist/src/THStack.cxx
+++ b/hist/hist/src/THStack.cxx
@@ -1034,8 +1034,11 @@ void THStack::RecursiveRemove(TObject *obj)
 void THStack::SavePrimitive(std::ostream &out, Option_t *option)
 {
    TString name = gInterpreter->MapCppName(GetName());
+   if (name.IsNull())
+      name = "hstack";
+
+   out << "   " << ClassName() << " *" << name << " = new " << ClassName() << "();\n";
 
-   SavePrimitiveConstructor(out, Class(), name);
    SavePrimitiveNameTitle(out, name);
 
    if (fMinimum != -1111)