diff --git a/src/DocumentLibrary/CatalogPlus.py b/src/DocumentLibrary/CatalogPlus.py
index d7f142f..df5c466 100644
--- a/src/DocumentLibrary/CatalogPlus.py
+++ b/src/DocumentLibrary/CatalogPlus.py
@@ -152,7 +152,8 @@
         self.uncatalogObject(uid)
 
     def getLexicon(self):
-        lexicon = self.lexicon
+#        lexicon = self.lexicon
+        lexicon = None
 
         if type(lexicon) == type(''):
             vocabulary = getattr(self, lexicon, None)
diff --git a/src/DocumentLibrary/DocumentStore.py b/src/DocumentLibrary/DocumentStore.py
index 2e77f94..5882397 100644
--- a/src/DocumentLibrary/DocumentStore.py
+++ b/src/DocumentLibrary/DocumentStore.py
@@ -146,7 +146,7 @@
 
         for name, index_class in self._defaultCatalogIndexes:
             if index_class is TextIndex:
-                self.Catalog.addIndex(name, index_class(name, lexicon=lexicon))
+                self.Catalog.addIndex(name, index_class(name))
             else:
                 self.Catalog.addIndex(name, index_class(name))
 
@@ -452,7 +452,7 @@
 
         if index_class is TextIndex:
             self.Catalog.addIndex(name, 
-                                  index_class(name, lexicon=self.Catalog.getLexicon()))
+                                  index_class(name))
         else:
             self.Catalog.addIndex(name, index_class(name))