2 files changed, 29 insertions, 16 deletions

diff --git a/src/base/stats/mysql.cc b/src/base/stats/mysql.cc
index 42464993d..72f31240d 100644
--- a/src/base/stats/mysql.cc
+++ b/src/base/stats/mysql.cc
@@ -584,10 +584,11 @@ MySql::configure(const DistInfoBase &info)
         return;
 
     if (!info.data.fancy) {
-        stat.size = info.data.size;
-        stat.min = info.data.min;
-        stat.max = info.data.max;
-        stat.bktsize = info.data.bucket_size;
+        const Params *params = safe_cast<const Params *>(info.storageParams);
+        stat.size = params->buckets;
+        stat.min = params->min;
+        stat.max = params->max;
+        stat.bktsize = params->bucket_size;
     }
     insert(info.id, stat.setup(run));
 }
@@ -599,10 +600,11 @@ MySql::configure(const VectorDistInfoBase &info)
         return;
 
     if (!info.data[0].fancy) {
-        stat.size = info.data[0].size;
-        stat.min = info.data[0].min;
-        stat.max = info.data[0].max;
-        stat.bktsize = info.data[0].bucket_size;
+        const Params *params = safe_cast<const Params *>(info.storageParams);
+        stat.size = params->buckets;
+        stat.min = params->min;
+        stat.max = params->max;
+        stat.bktsize = params->bucket_size;
     }
 
     uint16_t statid = stat.setup(run);
diff --git a/src/base/stats/text.cc b/src/base/stats/text.cc
index 14300a0f8..3a00620c7 100644
--- a/src/base/stats/text.cc
+++ b/src/base/stats/text.cc
@@ -673,12 +673,18 @@ Text::visit(const DistInfoBase &info)
     print.squares = data.squares;
     print.samples = data.samples;
 
-    print.min = data.min;
-    print.max = data.max;
-    print.bucket_size = data.bucket_size;
-    print.size = data.size;
     print.fancy = data.fancy;
 
+    if (!data.fancy) {
+        const DistStor::Params *params =
+            safe_cast<const DistStor::Params *>(info.storageParams);
+
+        print.min = params->min;
+        print.max = params->max;
+        print.bucket_size = params->bucket_size;
+        print.size = params->buckets;
+    }
+
     print(*stream);
 }
 
@@ -710,11 +716,16 @@ Text::visit(const VectorDistInfoBase &info)
         print.squares = info.data[i].squares;
         print.samples = info.data[i].samples;
 
-        print.min = info.data[i].min;
-        print.max = info.data[i].max;
-        print.bucket_size = info.data[i].bucket_size;
-        print.size = info.data[i].size;
         print.fancy = info.data[i].fancy;
+        if (!print.fancy) {
+            const DistStor::Params *params =
+                safe_cast<const DistStor::Params *>(info.storageParams);
+
+            print.min = params->min;
+            print.max = params->max;
+            print.bucket_size = params->bucket_size;
+            print.size = params->buckets;
+        }
 
         print(*stream);
     }