diff --git a/scim-wnn/src/scim_wnn_imengine.cpp b/scim-wnn/src/scim_wnn_imengine.cpp
index 92403d9..29d7a03 100644
--- a/scim-wnn/src/scim_wnn_imengine.cpp
+++ b/scim-wnn/src/scim_wnn_imengine.cpp
@@ -499,7 +499,12 @@
         return(true);
     } else {
         // preeditor�ǽ����Ǥ��ʤ��ä����Ϥ�Ϥ�commit���ƥ��ץꥱ���������֤��٤�����
-        if (m_preeditor->getTextLength()) commit_string(m_preeditor->getText(true));
+        if (m_preeditor->getTextLength()) {
+            if (auto_conversion) {
+                commit_string(wnn.getText());
+                wnn.reset();
+            } else commit_string(m_preeditor->getText(true));
+        }
         m_preeditor->reset();
         updatePreEditor();
     }