diff --git a/XCode/Code/EntityBuilder.cs b/XCode/Code/EntityBuilder.cs
index 07d546866..b709edd55 100644
--- a/XCode/Code/EntityBuilder.cs
+++ b/XCode/Code/EntityBuilder.cs
@@ -1804,6 +1804,13 @@ protected virtual Boolean BuildExtendFindAll(IDataColumn[] columns, Int32 index)
 
             if (dc.DataType == typeof(Boolean))
                 type += "?";
+            else if (dc.DataType == typeof(String))
+            {
+                if (Option.Nullable && dc.Nullable)
+                {
+                    type += "?";
+                }
+            }
 
             ps[dc.CamelName()] = type;