diff --git a/bt5/erp5_dms_conversion_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_preConvertDocumentList.xml b/bt5/erp5_dms_conversion_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_preConvertDocumentList.xml
index e207b0ea802b839f656b60919cea6f25f4828871..f00ff6701b30b74f0e190103efcc890f610c027c 100644
--- a/bt5/erp5_dms_conversion_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_preConvertDocumentList.xml
+++ b/bt5/erp5_dms_conversion_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_preConvertDocumentList.xml
@@ -52,14 +52,16 @@
             <key> <string>_body</string> </key>
             <value> <string>portal = context.getPortalObject()\n
 portal_id = portal.getId()\n
+MARKER = (None, \'\',)\n
 \n
 for index_uid in range(len(uid)):\n
   document_relative_url = getPath[index_uid].replace("/%s/" %portal_id, "")\n
   document = portal.restrictedTraverse(document_relative_url)\n
   if getattr(document, "convert", None) is not None and \\\n
      getattr(document, "getData", None) is not None and \\\n
-     (document.getData() not in (None, \'\',) or document.getBaseData() not in (None, \'\',)):\n
-    document.Base_preConvert()\n
+     (document.getData() not in MARKER or document.getBaseData() not in MARKER):\n
+    #context.log("preconvert %s" %document.getRelativeUrl())\n
+    document.activate(serialize_tag="conversion").Base_preConvert()\n
 </string> </value>
         </item>
         <item>
diff --git a/bt5/erp5_dms_conversion_catalog/bt/revision b/bt5/erp5_dms_conversion_catalog/bt/revision
index 56a6051ca2b02b04ef92d5150c9ef600403cb1de..d8263ee9860594d2806b0dfd1bfd17528b0ba2a4 100644
--- a/bt5/erp5_dms_conversion_catalog/bt/revision
+++ b/bt5/erp5_dms_conversion_catalog/bt/revision
@@ -1 +1 @@
-1
\ No newline at end of file
+2
\ No newline at end of file
diff --git a/product/ERP5OOo/tests/testDms.py b/product/ERP5OOo/tests/testDms.py
index 78cce5eda81b9ef4b9b9a40d01112f8c03439990..2004a371cd5930d5d86677b0ce967b4dc1675324 100644
--- a/product/ERP5OOo/tests/testDms.py
+++ b/product/ERP5OOo/tests/testDms.py
@@ -1350,7 +1350,6 @@ class TestDocument(TestDocumentMixin):
 
     # Delete base_data
     document.edit(base_data=None)
-    self.stepTic()
     
     # As document is not converted, text conversion is impossible
     self.assertRaises(NotConvertedError, document.asText)