diff --git a/pandas_access/__init__.py b/pandas_access/__init__.py
index 9fffccb..6b1dfe5 100644
--- a/pandas_access/__init__.py
+++ b/pandas_access/__init__.py
@@ -8,10 +8,10 @@
     from io import BytesIO
 
 
-TABLE_RE = re.compile("CREATE TABLE \[(\w+)\]\s+\((.*?\));",
+TABLE_RE = re.compile("CREATE TABLE \[([^\]]+)\]\s*\(([^\;]*)\)\;",
                       re.MULTILINE | re.DOTALL)
 
-DEF_RE = re.compile("\s*\[(\w+)\]\s*(.*?),")
+DEF_RE = re.compile("\s*\[(\w+)\]\s*([^,]*),?")
 
 
 def list_tables(rdb_file, encoding="latin-1"):