diff --git a/GUI/Models/JobItem.cpp b/GUI/Models/JobItem.cpp
index 662e98d1170e580e397c671989fcbbf33834b378..4c1310f9fc0dbbd8a5591841679249e9b9f7ef7a 100644
--- a/GUI/Models/JobItem.cpp
+++ b/GUI/Models/JobItem.cpp
@@ -268,7 +268,7 @@ ParameterContainerItem* JobItem::parameterContainerItem()
 
 const ParameterContainerItem* JobItem::parameterContainerItem() const
 {
-    return dynamic_cast<ParameterContainerItem*>(getItem(JobItem::T_PARAMETER_TREE));
+    return dynamic_cast<ParameterContainerItem*>(getItem(T_PARAMETER_TREE));
 }
 
 FitParameterContainerItem* JobItem::fitParameterContainerItem()
@@ -279,6 +279,12 @@ FitParameterContainerItem* JobItem::fitParameterContainerItem()
     return nullptr;
 }
 
+ParameterContainerItem* JobItem::createParameterContainerItem()
+{
+    return model()->insertItem<ParameterContainerItem>
+        (this, -1, T_PARAMETER_TREE);
+}
+
 RealDataItem* JobItem::realDataItem()
 {
     return dynamic_cast<RealDataItem*>(getItem(JobItem::T_REALDATA));
diff --git a/GUI/Models/JobItem.h b/GUI/Models/JobItem.h
index dafa6078b44b662649a8e8195a4c85a3ce4aa603..bef0834c4d3e6b4928cdeac7699f3576015fa592 100644
--- a/GUI/Models/JobItem.h
+++ b/GUI/Models/JobItem.h
@@ -51,9 +51,9 @@ private:
     static const QString T_OUTPUT;
     static const QString T_REALDATA;
     static const QString T_DATAVIEW;
+    static const QString T_PARAMETER_TREE;
 
 public:
-    static const QString T_PARAMETER_TREE;
     static const QString T_SIMULATION_OPTIONS;
     static const QString T_FIT_SUITE;
 
@@ -107,8 +107,9 @@ public:
     FitSuiteItem* fitSuiteItem();
     ParameterContainerItem* parameterContainerItem();
     const ParameterContainerItem* parameterContainerItem() const;
-
     FitParameterContainerItem* fitParameterContainerItem();
+    ParameterContainerItem* createParameterContainerItem();
+
     RealDataItem* realDataItem();
     RealDataItem* copyRealDataIntoJob(const RealDataItem* real_data);
     void addRealDataItem(RealDataItem* real_data);
diff --git a/GUI/Models/JobModel.cpp b/GUI/Models/JobModel.cpp
index 3045593b2bf282e21f948865b167318d0191048e..d9a71e54af80e334d039eb29080d4a7993344041 100644
--- a/GUI/Models/JobModel.cpp
+++ b/GUI/Models/JobModel.cpp
@@ -111,7 +111,7 @@ QVector<JobItem*> JobModel::jobItems() const
 //! restore instrument and sample model from backup for given JobItem
 void JobModel::restore(JobItem* jobItem)
 {
-    restoreItem(jobItem->getItem(JobItem::T_PARAMETER_TREE));
+    restoreItem(jobItem->parameterContainerItem());
 }
 
 bool JobModel::hasUnfinishedJobs()
diff --git a/GUI/Models/ParameterTreeUtils.cpp b/GUI/Models/ParameterTreeUtils.cpp
index f07106cc620afb6ad674fc9c13a0398d60db3b8e..415ecb5c09cd81621899be44bdab03f607fc7a55 100644
--- a/GUI/Models/ParameterTreeUtils.cpp
+++ b/GUI/Models/ParameterTreeUtils.cpp
@@ -88,8 +88,7 @@ void populateParameterContainer(SessionItem* container, const SessionItem* sourc
 
 void ParameterTreeUtils::createParameterTree(JobItem* jobItem)
 {
-    auto container = jobItem->model()->insertItem<ParameterContainerItem>(
-        jobItem, -1, JobItem::T_PARAMETER_TREE);
+    auto container = jobItem->createParameterContainerItem();
 
     populateParameterContainer(container, jobItem->materialContainerItem());