diff --git a/lib/core/common.py b/lib/core/common.py
index cdf0c8507..9fd6ff5f1 100644
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -1822,7 +1822,7 @@ def expandAsteriskForColumns(expression):
     the SQL query string (expression)
     """
 
-    match = re.search(r"(?i)\ASELECT(\s+TOP\s+[\d]+)?\s+\*\s+FROM\s+((`[^`]+`|[^\s]+)+)", expression)
+    match = re.search(r"(?i)\ASELECT(\s+TOP\s+[\d]+)?\s+\*\s+FROM\s+([`'\"][^`'\"]+[`'\"]|\w+)(\s|\Z)", expression)
 
     if match:
         infoMsg = "you did not provide the fields in your query. "
diff --git a/lib/core/settings.py b/lib/core/settings.py
index a1a72531b..1699fce8f 100644
--- a/lib/core/settings.py
+++ b/lib/core/settings.py
@@ -20,7 +20,7 @@ from thirdparty import six
 from thirdparty.six import unichr as _unichr
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.6.12.3"
+VERSION = "1.6.12.4"
 TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
 TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
 VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)