diff --git a/epwing_book.cc b/epwing_book.cc
index f6eed69c..2e89be1d 100644
--- a/epwing_book.cc
+++ b/epwing_book.cc
@@ -1032,42 +1032,44 @@ void EpwingBook::fixHeadword( QString & headword )
 
   headword.remove( QChar( 0x30FB ) ); // Used in Japan transcription
 
-  if( isHeadwordCorrect( headword) )
-    return;
+  //if( isHeadwordCorrect( headword) )
+  //  return;
 
   QString fixed = headword;
   QRegularExpression leadingSlashRx( "/[^/]+/" );
   fixed.remove(leadingSlashRx );
 
-  if( isHeadwordCorrect( fixed ) )
-  {
-    headword = fixed;
-    return;
-  }
+  //if( isHeadwordCorrect( fixed ) )
+  //{
+  //  headword = fixed;
+  //  return;
+  //}
 
   gd::wstring folded = Folding::applyPunctOnly( gd::toWString( fixed ) );
   fixed = gd::toQString( folded );
 
-  if( isHeadwordCorrect( fixed ) )
-  {
-    headword = fixed;
-    return;
-  }
+  //if( isHeadwordCorrect( fixed ) )
+  //{
+  //  headword = fixed;
+  //  return;
+  //}
 
   folded = Folding::applyDiacriticsOnly( folded );
   fixed = gd::toQString( folded );
 
-  if( isHeadwordCorrect( fixed ) )
-  {
-    headword = fixed;
-    return;
-  }
+  //if( isHeadwordCorrect( fixed ) )
+  //{
+  //  headword = fixed;
+  //  return;
+  //}
 
-  folded = Folding::applyWhitespaceOnly( folded );
-  fixed = gd::toQString( folded );
+  //folded = Folding::applyWhitespaceOnly( folded );
+  //fixed = gd::toQString( folded );
 
-  if( isHeadwordCorrect( fixed ) )
-    headword = fixed;
+  //if( isHeadwordCorrect( fixed ) )
+  //  headword = fixed;
+
+  headword = fixed;
 }
 
 void EpwingBook::getArticle( QString & headword, QString & articleText,
diff --git a/folding.cc b/folding.cc
index 6136b817..9cbeb136 100644
--- a/folding.cc
+++ b/folding.cc
@@ -596,7 +596,7 @@ bool isPunct( wchar ch )
     case 0xFF64: // HALFWIDTH IDEOGRAPHIC COMMA
       return true;
     default:
-      return false;
+      return QChar::isPunct(ch)||QChar::isSymbol(ch);
   }
 }