diff --git a/Redaction/Clean.xba b/Redaction/Clean.xba
index 8703d6f..5620b00 100644
--- a/Redaction/Clean.xba
+++ b/Redaction/Clean.xba
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Clean" script:language="StarBasic">Sub mark39
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Clean" script:language="StarBasic">Sub mark40
 
 End Sub
 
@@ -646,6 +646,8 @@ Private Sub cleanFormatting
 	
 	removeDirectFormatting()
 	
+	saveAndreload()
+	
 	convertUserFieldsToFormatting
 	
 End Sub
@@ -1328,9 +1330,10 @@ Private Sub convertFormatToUserFields(identifier As String, styleNames, styleVal
 		If Len(found.String) &lt;&gt; 0 Then
 			insertUserField(found.End,rightField &amp; i,&quot;&quot;)
 			insertUserField(found.start,leftField &amp; i,&quot;&quot;)
+			i = i + 1
 		EndIf
 		found = Thiscomponent.findNext(found.End, SDesc)
-		i = i + 1
+		
 	  Loop
 End Sub
 
@@ -1353,6 +1356,7 @@ Private Sub convertUserFieldsToFormat(identifier As String, styleNames , styleVa
 		leftFieldName = &quot;com.sun.star.text.FieldMaster.User&quot; &amp; &quot;.&quot; &amp; &quot;left&quot; &amp; identifier &amp; i
 		rightFieldName = &quot;com.sun.star.text.FieldMaster.User&quot; &amp; &quot;.&quot; &amp; &quot;right&quot; &amp; identifier &amp; i
 		If oMasters.hasByName(leftFieldName) AND oMasters.hasByName(rightFieldName) Then
+		  	i=i+1
 		  	leftFieldMaster = oMasters.getByName(leftFieldName)
 			leftField = leftFieldMaster.DependentTextFields(0)
 			leftAnchor = leftField.getAnchor()
@@ -1367,7 +1371,6 @@ Private Sub convertUserFieldsToFormat(identifier As String, styleNames , styleVa
 		  	leftFieldMaster.dispose()
 		  	rightField.dispose()
 		  	rightFieldMaster.dispose()
-		  	i=i+1
 	  	Else
 	  		Exit sub
 	  	EndIf
diff --git a/cleanandvalidate.update.xml b/cleanandvalidate.update.xml
index a32be5e..25a2c19 100644
--- a/cleanandvalidate.update.xml
+++ b/cleanandvalidate.update.xml
@@ -2,9 +2,9 @@
 <description xmlns="http://openoffice.org/extensions/update/2006" 
              xmlns:xlink="http://www.w3.org/1999/xlink">
     <identifier value="pro.litvinovg.Redaction"/>
-    <version value="0.6.3" />
+    <version value="0.6.4" />
     <update-download>
-        <src xlink:href="https://dev.litvinovg.pro/litvinovg/cleanandvalidate/uploads/b5e9f19d02f7182b4816b5fc04b8dc4c/cleanAndValidate.oxt" />
+        <src xlink:href="https://dev.litvinovg.pro/litvinovg/cleanandvalidate/uploads/ff48dad6ec7c43f2ec5e06a6e14c5d1e/cleanAndValidate.oxt" />
     </update-download>
     <release-notes>
         <src xlink:href="https://dev.litvinovg.pro/litvinovg/cleanandvalidate/-/raw/master/releasenotes.txt" lang="en" />
diff --git a/description.xml b/description.xml
index e96ac94..6494fc5 100644
--- a/description.xml
+++ b/description.xml
@@ -3,7 +3,7 @@
              xmlns:dep="http://openoffice.org/extensions/description/2006"
              xmlns:xlink="http://www.w3.org/1999/xlink">
   <identifier value="pro.litvinovg.Redaction" />
-  <version value="0.6.3" />
+  <version value="0.6.4" />
   <platform value="all" />
   <display-name>
     <name lang="en">Cleaning and validation documents for publishing in html and epub with pagination</name>
diff --git a/releasenotes.txt b/releasenotes.txt
index 5fbca6f..c89e18a 100644
--- a/releasenotes.txt
+++ b/releasenotes.txt
@@ -1,3 +1,4 @@
+0.6.4 Bugfix for latest format cleaning with fields
 0.6.3 Update configuration added
 0.6.2 Remove all macros from document
 0.6.1 Cleaning with user fields