diff --git a/GUI/Model/Descriptor/DistributionItems.cpp b/GUI/Model/Descriptor/DistributionItems.cpp
index 4825ddcd284270430d34a74ae61f60cacbde1760..c7aec07a5360f189c9e82ca82948333057b21fd6 100644
--- a/GUI/Model/Descriptor/DistributionItems.cpp
+++ b/GUI/Model/Descriptor/DistributionItems.cpp
@@ -23,8 +23,8 @@ using std::variant;
 
 DistributionItem::DistributionItem()
 {
-    m_numberOfSamples.init("Number of samples", "", 5, "", RealLimits::lowerLimited(1.0),
-                           "nSamples");
+//    m_numberOfSamples.init("Number of samples", "", 5, "", RealLimits::lowerLimited(1.0),
+//                           "nSamples");
 }
 
 void DistributionItem::setLimits(const RealLimits& limits)
@@ -51,7 +51,7 @@ bool DistributionItem::hasSigmaFactor() const
 void DistributionItem::serialize(Streamer& s)
 {
     s.assertVersion(0);
-    Serialize::rwProperty(s, m_numberOfSamples);
+    Serialize::rwValue(s, "numberOfSamples", m_numberOfSamples);
 
     for (auto* p : m_serializationProperties)
         Serialize::rwProperty(s, *p);
@@ -65,6 +65,16 @@ RealLimits DistributionItem::limits() const
     return m_limits;
 }
 
+uint DistributionItem::numberOfSamples() const
+{
+    return m_numberOfSamples;
+}
+
+void DistributionItem::setNumberOfSamples(uint value)
+{
+    m_numberOfSamples = value;
+}
+
 // --------------------------------------------------------------------------------------------- //
 
 SymmetricResolutionItem::SymmetricResolutionItem(double mean, int decimals,
diff --git a/GUI/Model/Descriptor/DistributionItems.h b/GUI/Model/Descriptor/DistributionItems.h
index 2c6c98d52ae5dd271ff462034bcdf2055232cca0..5ba4ff03bf643484bfacd98b29b4ad2232e9343a 100644
--- a/GUI/Model/Descriptor/DistributionItems.h
+++ b/GUI/Model/Descriptor/DistributionItems.h
@@ -16,7 +16,6 @@
 #define BORNAGAIN_GUI_MODEL_DESCRIPTOR_DISTRIBUTIONITEMS_H
 
 #include "GUI/Model/Descriptor/DoubleProperty.h"
-#include "GUI/Model/Descriptor/UIntProperty.h"
 #include <QVector>
 #include <memory>
 
@@ -45,7 +44,9 @@ public:
     //! Set the unit of the distributed value
     virtual void setUnit(const std::variant<QString, Unit>& unit) = 0;
 
-    UINT_PROPERTY(numberOfSamples, NumberOfSamples);
+    uint numberOfSamples() const;
+    void setNumberOfSamples(uint value);
+
     DOUBLE_PROPERTY(sigmaFactor, SigmaFactor);
     bool hasSigmaFactor() const;
 
@@ -65,6 +66,8 @@ protected:
 
 private:
     QVector<DoubleProperty*> m_serializationProperties; //! properties to be serialized
+
+    uint m_numberOfSamples = 5;
 };
 
 class SymmetricResolutionItem : public DistributionItem {