diff --git a/Version Control.accda.src/dbs-properties.json b/Version Control.accda.src/dbs-properties.json
index b1a8dd2b..fe8c768b 100644
--- a/Version Control.accda.src/dbs-properties.json	
+++ b/Version Control.accda.src/dbs-properties.json	
@@ -41,7 +41,7 @@
       "Type": 10
     },
     "AppVersion": {
-      "Value": "4.0.8",
+      "Value": "4.0.9",
       "Type": 10
     },
     "Auto Compact": {
diff --git a/Version Control.accda.src/modules/clsDbTableDataMacro.cls b/Version Control.accda.src/modules/clsDbTableDataMacro.cls
index 19105853..6099ed82 100644
--- a/Version Control.accda.src/modules/clsDbTableDataMacro.cls	
+++ b/Version Control.accda.src/modules/clsDbTableDataMacro.cls	
@@ -145,7 +145,7 @@ Private Function IDbComponent_GetAllFromDB(Optional blnModifiedOnly As Boolean =
                 If Left$(tdf.Name, 1) <> "~" Then
                     If Len(tdf.Connect) = 0 Then
                         ' Check to see if the table has a data macro
-                        strSql = "Not IsNull(LvExtra) and Type = 1 and [Name] = """ & tdf.Name & """"
+                        strSql = "(LvExtra is not null) and (Type = 1) and ([Name] = """ & tdf.Name & """)"
                         If DCount("[Name]", "MSysObjects", strSql) > 0 Then
                             Set cTable = New clsDbTableDataMacro
                             Set cTable.DbObject = CurrentData.AllTables(tdf.Name)