diff --git a/plugins/generic/enumeration.py b/plugins/generic/enumeration.py
index ec3a99fbc..023378a86 100644
--- a/plugins/generic/enumeration.py
+++ b/plugins/generic/enumeration.py
@@ -1211,6 +1211,15 @@ class Enumeration:
             indexRange = getRange(count, dump=True, plusOne=plusOne)
 
             if kb.dbms == DBMS.ACCESS:
+                for column in colList:
+                    # It would be good to have a numeric column as a pivot
+                    result = inject.checkBooleanExpression("%s" % safeStringFormat("EXISTS(SELECT %s FROM %s WHERE %s>0)", (column, conf.tbl, column)))
+
+                    if result:
+                        colList.remove(column)
+                        colList.insert(0, column)
+                        break
+
                 value = " "
                 for column in colList:
                     for index in indexRange:
diff --git a/xml/queries.xml b/xml/queries.xml
index 1bea7c0f2..864084c6c 100644
--- a/xml/queries.xml
+++ b/xml/queries.xml
@@ -359,7 +359,7 @@
         <tables/>
         <dump_table>
             <inband query="SELECT %s FROM %s"/>
-            <blind query="SELECT MIN(%s) FROM %s WHERE CVAR(%s) > '%s'" query2="SELECT TOP 1 %s FROM %s WHERE %s LIKE '%s'" count="SELECT COUNT(*) FROM %s"/>
+            <blind query="SELECT MIN(%s) FROM %s WHERE CVAR(%s) > '%s'" query2="SELECT TOP 1 %s FROM %s WHERE CVAR(%s) LIKE '%s'" count="SELECT COUNT(*) FROM %s"/>
         </dump_table>
    </dbms>