diff --git a/lib/utils/hash.py b/lib/utils/hash.py
index ba4acade0..50d31fa45 100644
--- a/lib/utils/hash.py
+++ b/lib/utils/hash.py
@@ -259,6 +259,7 @@ def attackDumpedTable():
 
                         if value.lower() == hash_.lower():
                             table[column]['values'][i] += " (%s)" % password
+                            table[column]['length'] = max(table[column]['length'], table[column]['values'][i])
 
 def hashRecognition(value):
     retVal = None
diff --git a/plugins/generic/enumeration.py b/plugins/generic/enumeration.py
index 8eaa7a2d0..15fd5e917 100644
--- a/plugins/generic/enumeration.py
+++ b/plugins/generic/enumeration.py
@@ -1358,10 +1358,7 @@ class Enumeration:
                 logger.critical(errMsg)
 
             for column, columnEntries in entries.items():
-                if lengths[column] < len(column):
-                    length = len(column)
-                else:
-                    length = lengths[column]
+                length = max(lengths[column], len(column))
 
                 kb.data.dumpedTable[column] = { "length": length,
                                                 "values": columnEntries }