diff --git a/honoka/src/honoka_imengine.cpp b/honoka/src/honoka_imengine.cpp
index 55db909..ddbf1b2 100644
--- a/honoka/src/honoka_imengine.cpp
+++ b/honoka/src/honoka_imengine.cpp
@@ -673,11 +673,11 @@
         if (k_commit.comp(key)) {
             if (auto_conversion) {
                 commit_string(m_convertor->getText());
-                if (m_predictor->isConnected()) m_predictor->update(m_convertor->getText(),m_preeditor->getText(true));
+                if (prediction) if (m_predictor->isConnected()) m_predictor->update(m_convertor->getText(),m_preeditor->getText(true));
                 m_convertor->reset();
             } else {
                 commit_string(m_preeditor->getText(true));
-                if (m_predictor->isConnected()) m_predictor->update(m_preeditor->getText(true),m_preeditor->getText(true));
+                if (prediction) if (m_predictor->isConnected()) m_predictor->update(m_preeditor->getText(true),m_preeditor->getText(true));
             }
             m_preeditor->reset();
             while(preeditStack.size()) {
@@ -828,11 +828,11 @@
     } else
     if (k_commit.comp(key)) {
         commit_string(m_convertor->getText());
-        while(preeditStack.size()) {
-            preeditStack.pop();
-        }
+        //while(preeditStack.size()) {
+        //    preeditStack.pop();
+       // }
         m_convertor->updateFrequency();
-        if (m_predictor->isConnected()) m_predictor->update(m_convertor->getText(),m_preeditor->getText(true));
+        if (prediction) if (m_predictor->isConnected()) m_predictor->update(m_convertor->getText(),m_preeditor->getText(true));
         m_preeditor->reset();
         m_convertor->reset();
         m_conversion = false;
@@ -992,7 +992,7 @@
         */
         commit_string(m_convertor->getText());
         m_convertor->updateFrequency();
-        if (m_predictor->isConnected()) m_predictor->update(m_convertor->getText(),m_preeditor->getText(true));
+        if (prediction) if (m_predictor->isConnected()) m_predictor->update(m_convertor->getText(),m_preeditor->getText(true));
         m_preeditor->reset();
         m_convertor->reset();
         m_conversion = false;
@@ -1180,7 +1180,7 @@
     if (m_conversion) {
         commit_string(m_convertor->getText());
         m_convertor->updateFrequency();
-        if (m_predictor->isConnected()) m_predictor->update(m_convertor->getText(),m_preeditor->getText(true));
+        if (prediction) if (m_predictor->isConnected()) m_predictor->update(m_convertor->getText(),m_preeditor->getText(true));
         m_convertor->reset();
         if (m_def_convertor != m_convertor) m_convertor = m_def_convertor;
         m_conversion = false;