diff --git a/honoka/libhonoka/honokatimer.cpp b/honoka/libhonoka/honokatimer.cpp
index c62cd57..b80a2ed 100644
--- a/honoka/libhonoka/honokatimer.cpp
+++ b/honoka/libhonoka/honokatimer.cpp
@@ -133,10 +133,12 @@
     uint32 c = decode(trans);
     if (c == 0) return res;
     for(uint32 i = bef;i != c;i ++) {
-        map<uint32,int>::iterator it = events.find(i);
-        if (it == events.end()) break;
-        res.push_back(it->second);
-        events.erase(it);
+        multimap<uint32,int>::iterator it;
+        while(events.count(i)) {
+            it = events.find(i);
+            res.push_back(it->second);
+            events.erase(it);
+        }
         if (i == 0xffffffff) i = 0;
     }
     bef = c;
diff --git a/honoka/libhonoka/honokatimer.h b/honoka/libhonoka/honokatimer.h
index f7808ba..06b3353 100644
--- a/honoka/libhonoka/honokatimer.h
+++ b/honoka/libhonoka/honokatimer.h
@@ -67,7 +67,7 @@
     pid_t timer_pid;
     uint32 bef;
     int eventCount;
-    map<uint32,int> events;
+    multimap<uint32,int> events;
 };
 
 }
diff --git a/honoka/po/honoka.pot b/honoka/po/honoka.pot
index fcfb55b..6f0783c 100644
--- a/honoka/po/honoka.pot
+++ b/honoka/po/honoka.pot
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-04 15:19+0900\n"
+"POT-Creation-Date: 2006-02-13 16:25+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -453,7 +453,7 @@
 
 #: plugins/romkan.cpp:64 plugins/kanainput.cpp:52 plugins/nicolainput.cpp:74
 #: plugins/wnnplugin.cpp:78 plugins/anthyplugin.cpp:46
-#: plugins/simpleprediction.cpp:53 plugins/primeprediction.cpp:71
+#: plugins/simpleprediction.cpp:53 plugins/primeprediction.cpp:72
 #: plugins/skkdicconversion.cpp:53 plugins/cannaconversion.cpp:57
 #: plugins/asciiplugin.cpp:84
 msgid "shortcut keys: "
@@ -557,7 +557,7 @@
 
 #: plugins/wnnconversion.cpp:412 plugins/anthyconversion.cpp:169
 #: plugins/anthyprediction.cpp:60 plugins/simpleprediction.cpp:91
-#: plugins/primeprediction.cpp:179 plugins/skkdicconversion.cpp:122
+#: plugins/primeprediction.cpp:180 plugins/skkdicconversion.cpp:122
 #: plugins/cannaconversion.cpp:201 plugins/wordsprediction.cpp:85
 msgid "lookup result"
 msgstr ""
@@ -654,23 +654,23 @@
 msgid "SimplePrediction"
 msgstr ""
 
-#: plugins/primeprediction.cpp:51
+#: plugins/primeprediction.cpp:52
 msgid "PrimePrediction-plugin"
 msgstr ""
 
-#: plugins/primeprediction.cpp:65
+#: plugins/primeprediction.cpp:66
 msgid "_Lookup method: "
 msgstr ""
 
-#: plugins/primeprediction.cpp:67
+#: plugins/primeprediction.cpp:68
 msgid "select the lookup method."
 msgstr ""
 
-#: plugins/primeprediction.cpp:73
+#: plugins/primeprediction.cpp:74
 msgid "Prime Prediction: "
 msgstr ""
 
-#: plugins/primeprediction.cpp:261
+#: plugins/primeprediction.cpp:262
 msgid "PrimePrediction"
 msgstr ""
 
diff --git a/honoka/po/ja.po b/honoka/po/ja.po
index bb84267..2acf79d 100644
--- a/honoka/po/ja.po
+++ b/honoka/po/ja.po
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-04 15:19+0900\n"
+"POT-Creation-Date: 2006-02-13 16:25+0900\n"
 "PO-Revision-Date: 2004-12-01 14:29+0900\n"
 "Last-Translator: ＴＡＭ (Teppei Tamra) <tam-t@par.odn.ne.jp>\n"
 "Language-Team: Japanese\n"
@@ -459,7 +459,7 @@
 
 #: plugins/romkan.cpp:64 plugins/kanainput.cpp:52 plugins/nicolainput.cpp:74
 #: plugins/wnnplugin.cpp:78 plugins/anthyplugin.cpp:46
-#: plugins/simpleprediction.cpp:53 plugins/primeprediction.cpp:71
+#: plugins/simpleprediction.cpp:53 plugins/primeprediction.cpp:72
 #: plugins/skkdicconversion.cpp:53 plugins/cannaconversion.cpp:57
 #: plugins/asciiplugin.cpp:84
 msgid "shortcut keys: "
@@ -565,7 +565,7 @@
 
 #: plugins/wnnconversion.cpp:412 plugins/anthyconversion.cpp:169
 #: plugins/anthyprediction.cpp:60 plugins/simpleprediction.cpp:91
-#: plugins/primeprediction.cpp:179 plugins/skkdicconversion.cpp:122
+#: plugins/primeprediction.cpp:180 plugins/skkdicconversion.cpp:122
 #: plugins/cannaconversion.cpp:201 plugins/wordsprediction.cpp:85
 msgid "lookup result"
 msgstr "候補一覧"
@@ -662,23 +662,23 @@
 msgid "SimplePrediction"
 msgstr "単純予測"
 
-#: plugins/primeprediction.cpp:51
+#: plugins/primeprediction.cpp:52
 msgid "PrimePrediction-plugin"
 msgstr "Prime予測プラグイン"
 
-#: plugins/primeprediction.cpp:65
+#: plugins/primeprediction.cpp:66
 msgid "_Lookup method: "
 msgstr "検索方法"
 
-#: plugins/primeprediction.cpp:67
+#: plugins/primeprediction.cpp:68
 msgid "select the lookup method."
 msgstr "検索方法を選んで下さい。"
 
-#: plugins/primeprediction.cpp:73
+#: plugins/primeprediction.cpp:74
 msgid "Prime Prediction: "
 msgstr "prime予測:"
 
-#: plugins/primeprediction.cpp:261
+#: plugins/primeprediction.cpp:262
 msgid "PrimePrediction"
 msgstr "prime予測"
 
diff --git a/honoka/src/honoka_imengine.cpp b/honoka/src/honoka_imengine.cpp
index d8ff828..b6356d8 100644
--- a/honoka/src/honoka_imengine.cpp
+++ b/honoka/src/honoka_imengine.cpp
@@ -755,12 +755,14 @@
 
 void HonokaInstance::process_helper_event (const String &helper_uuid, const Transaction &trans) 
 {
+    WideString t = m_preeditor->getText();
     if (helper_uuid == HONOKA_TIMER_UUID) {
         vector<int> e = HonokaTimer::self()->eventFilter(trans);
         for(unsigned int i = 0;i < e.size();i ++) {
             timerEvent(e[i]);
         }
     }
+    if ((!m_conversion) && (!m_prediction) && (t != m_preeditor->getText())) updatePreEditor();
 }
 
 
@@ -1683,7 +1685,7 @@
     for(unsigned int i = 0;i < preeditors.size();i ++) {
         if (preeditors[i]->findTimerEventId(id)) {
             preeditors[i]->timerEvent(id);
-            if ((!m_conversion) && (!m_prediction)) updatePreEditor();
+            //if ((!m_conversion) && (!m_prediction)) updatePreEditor();
             return;
         }
     }