diff --git a/epwing_book.cc b/epwing_book.cc
index 21e1244e..8477916d 100644
--- a/epwing_book.cc
+++ b/epwing_book.cc
@@ -1032,6 +1032,9 @@ void EpwingBook::fixHeadword( QString & headword )
 
   headword.remove( QChar( 0x30FB ) ); // Used in Japan transcription
 
+  //replace any unicode Number ,Symbol ,Punctuation ,Mark character to whitespace
+  headword.replace( QRegularExpression( "[\\p{N}\\p{S}\\p{P}\\p{M}]" ), " " );
+
   //if( isHeadwordCorrect( headword) )
   //  return;
 
@@ -1046,7 +1049,7 @@ void EpwingBook::fixHeadword( QString & headword )
   //}
 
   gd::wstring folded = Folding::applyPunctOnly( gd::toWString( fixed ) );
-  fixed = gd::toQString( folded );
+  //fixed = gd::toQString( folded );
 
   //if( isHeadwordCorrect( fixed ) )
   //{
diff --git a/folding.cc b/folding.cc
index 9cbeb136..6136b817 100644
--- a/folding.cc
+++ b/folding.cc
@@ -596,7 +596,7 @@ bool isPunct( wchar ch )
     case 0xFF64: // HALFWIDTH IDEOGRAPHIC COMMA
       return true;
     default:
-      return QChar::isPunct(ch)||QChar::isSymbol(ch);
+      return false;
   }
 }